pinctrl: berlin: clean up

PATCH Applied Antoine Tenart 3 participants 17 messages Oct 13, 2015 – Oct 16, 2015

Subsystems (4)

Arm (32-bit) Arm sub-architectures Pin control Arm/Synaptics SoC support

lore

Share & tools

lore

Antoine Tenart

author

2015-10-13 21:31 UTC #0 lore raw

cover pinctrl: berlin: clean up

Linus, Sebastian,

This series has a few patches to clean up a bit the Berlin pinctrl drivers. The main modification is to move the pinctrl driver selection from mach-berlin to drivers/pinctrl/berlin. Then a missing dependency is added and finally the last 2 patches are cosmetics.

This series depends on the series submitted by Jisheng some days ago [1].

Thanks!

Antoine

[1] https://lkml.org/lkml/2015/10/9/278

Antoine Tenart (5):
pinctrl: berlin: select the pinctrl driver according to the SoC used
ARM: berlin: remove the pinctrl selection from the mach-berlin Kconfig
pinctrl: berlin: add explicit dependency on OF
pinctrl: berlin: Kconfig clean up
pinctrl: berlin: fix my family name spelling

 arch/arm/mach-berlin/Kconfig          |  3 ---
 drivers/pinctrl/berlin/Kconfig        | 11 +++++++----
 drivers/pinctrl/berlin/berlin-bg2.c   |  4 ++--
 drivers/pinctrl/berlin/berlin-bg2cd.c |  4 ++--
 drivers/pinctrl/berlin/berlin-bg2q.c  |  4 ++--
 drivers/pinctrl/berlin/berlin.c       |  2 +-
 drivers/pinctrl/berlin/berlin.h       |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

Signature · 1 line

2.6.1

Antoine Tenart

author

2015-10-13 21:31 UTC #1 lore raw

PATCH 1/5 pinctrl: berlin: select the pinctrl driver according to the SoC used

This patch prepares to remove the pinctrl driver selection from the mach-berlin Kconfig. To do so, bool is replaced by def_bool.

Signed-off-by Antoine Tenart <[email protected]>

---
 drivers/pinctrl/berlin/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/pinctrl/berlin/Kconfig +3 -3

index 740a13675fd1..7eb4bb615867 100644
@@ -6,15 +6,15 @@ config PINCTRL_BERLIN
 	select REGMAP_MMIO
 
 config PINCTRL_BERLIN_BG2
-	bool
+	def_bool MACH_BERLIN_BG2
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG2CD
-	bool
+	def_bool MACH_BERLIN_BG2CD
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG2Q
-	bool
+	def_bool MACH_BERLIN_BG2Q
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG4CT

Signature · 1 line

2.6.1

Sebastian Hesselbarth

maintainer Acked-by on v1 1/5

2015-10-15 21:47 UTC #2 lore raw

Re: [PATCH 1/5] pinctrl: berlin: select the pinctrl driver according to the SoC used

Quoted 4 lines · Antoine Tenart

This patch prepares to remove the pinctrl driver selection from the mach-berlin Kconfig. To do so, bool is replaced by def_bool.
Signed-off-by Antoine Tenart <[email protected]>

Acked-by Sebastian Hesselbarth <[email protected]>

Quoted 28 lines

---
  drivers/pinctrl/berlin/Kconfig | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

drivers/pinctrl/berlin/Kconfig +3 -3

index 740a13675fd1..7eb4bb615867 100644
@@ -6,15 +6,15 @@ config PINCTRL_BERLIN
  	select REGMAP_MMIO
 
  config PINCTRL_BERLIN_BG2
-	bool
+	def_bool MACH_BERLIN_BG2
  	select PINCTRL_BERLIN
 
  config PINCTRL_BERLIN_BG2CD
-	bool
+	def_bool MACH_BERLIN_BG2CD
  	select PINCTRL_BERLIN
 
  config PINCTRL_BERLIN_BG2Q
-	bool
+	def_bool MACH_BERLIN_BG2Q
  	select PINCTRL_BERLIN
 
  config PINCTRL_BERLIN_BG4CT

Linus Walleij

2015-10-16 14:09 UTC #3 lore raw

Re: [PATCH 1/5] pinctrl: berlin: select the pinctrl driver according to the SoC used

In reply to Antoine Tenart

Quoted 4 lines · Antoine Tenart

This patch prepares to remove the pinctrl driver selection from the mach-berlin Kconfig. To do so, bool is replaced by def_bool.
Signed-off-by Antoine Tenart <[email protected]>

Patch applied with Sebastian's ACK.

Yours,
Linus Walleij

Antoine Tenart

author

2015-10-13 21:31 UTC #4 lore raw

PATCH 2/5 ARM: berlin: remove the pinctrl selection from the mach-berlin Kconfig

In reply to Antoine Tenart

This patch removes the pinctrl driver selection from the mach-berlin Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.

Signed-off-by Antoine Tenart <[email protected]>

---
 arch/arm/mach-berlin/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

arch/arm/mach-berlin/Kconfig +0 -3

index 742d53a5f7f9..344434ca366c 100644
@@ -18,19 +18,16 @@ config MACH_BERLIN_BG2
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_SMP
-	select PINCTRL_BERLIN_BG2
 
 config MACH_BERLIN_BG2CD
 	bool "Marvell Armada 1500-mini (BG2CD)"
 	select CACHE_L2X0
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL_BERLIN_BG2CD
 
 config MACH_BERLIN_BG2Q
 	bool "Marvell Armada 1500 Pro (BG2-Q)"
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL_BERLIN_BG2Q
 
 endif

Signature · 1 line

2.6.1

Linus Walleij

Acked-by on v1 2/5

2015-10-16 14:19 UTC #5 lore raw

Re: [PATCH 2/5] ARM: berlin: remove the pinctrl selection from the mach-berlin Kconfig

Quoted 4 lines · Antoine Tenart

This patch removes the pinctrl driver selection from the mach-berlin Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.
Signed-off-by Antoine Tenart <[email protected]>

Acked-by Linus Walleij <[email protected]>

I can't merge this patch, take it through ARM SoC with other Marvell stuff.

Yours,
Linus Walleij

Sebastian Hesselbarth

maintainer Applied

2015-10-16 20:08 UTC #6 lore raw

Re: [PATCH 2/5] ARM: berlin: remove the pinctrl selection from the mach-berlin Kconfig

Quoted 6 lines · Linus Walleij

Quoted 3 lines · Antoine Tenart
This patch removes the pinctrl driver selection from the mach-berlin Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.

Quoted 6 lines

Quoted 1 line
Signed-off-by Antoine Tenart <[email protected]>
Acked-by Linus Walleij <[email protected]>
I can't merge this patch, take it through ARM SoC with other Marvell stuff.

Applied to berlin/soc with Linus' Ack.

Thanks,
Sebastian

Antoine Tenart

author

2015-10-13 21:31 UTC #7 lore raw

PATCH 3/5 pinctrl: berlin: add explicit dependency on OF

In reply to Antoine Tenart

Berlin pinctrl drivers depends on CONFIG_OF. This patch adds this dependency explicitly.

Signed-off-by Antoine Tenart <[email protected]>

---
 drivers/pinctrl/berlin/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

drivers/pinctrl/berlin/Kconfig +3 -0

index 7eb4bb615867..cf95b4d7f7e3 100644
@@ -7,14 +7,17 @@ config PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG2
 	def_bool MACH_BERLIN_BG2
+	depends on OF
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG2CD
 	def_bool MACH_BERLIN_BG2CD
+	depends on OF
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG2Q
 	def_bool MACH_BERLIN_BG2Q
+	depends on OF
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG4CT

Signature · 1 line

2.6.1

Linus Walleij

2015-10-16 14:20 UTC #8 lore raw

Re: [PATCH 3/5] pinctrl: berlin: add explicit dependency on OF

Quoted 4 lines · Antoine Tenart

Berlin pinctrl drivers depends on CONFIG_OF. This patch adds this dependency explicitly.
Signed-off-by Antoine Tenart <[email protected]>

Patch applied.

Yours,
Linus Walleij

Antoine Tenart

author

2015-10-13 21:31 UTC #9 lore raw

PATCH 4/5 pinctrl: berlin: Kconfig clean up

In reply to Antoine Tenart

Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing.

Signed-off-by Antoine Tenart <[email protected]>

---
 drivers/pinctrl/berlin/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/pinctrl/berlin/Kconfig +1 -1

index cf95b4d7f7e3..8fe6ad7795dc 100644
@@ -21,8 +21,8 @@ config PINCTRL_BERLIN_BG2Q
 	select PINCTRL_BERLIN
 
 config PINCTRL_BERLIN_BG4CT
-	depends on OF
 	bool "Marvell berlin4ct pin controller driver"
+	depends on OF
 	select PINCTRL_BERLIN
 
 endif

Signature · 1 line

2.6.1

Sebastian Hesselbarth

maintainer

2015-10-15 21:46 UTC #10 lore raw

Re: [PATCH 4/5] pinctrl: berlin: Kconfig clean up

Quoted 4 lines · Antoine Tenart

Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing.
Signed-off-by Antoine Tenart <[email protected]>

If this is the only patch that requires the dependency with Jisheng's pending patches, can you two agree on squashing it into Jisheng's patch set?

Sebastian

Quoted 19 lines

---
  drivers/pinctrl/berlin/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/pinctrl/berlin/Kconfig +1 -1

index cf95b4d7f7e3..8fe6ad7795dc 100644
@@ -21,8 +21,8 @@ config PINCTRL_BERLIN_BG2Q
  	select PINCTRL_BERLIN
 
  config PINCTRL_BERLIN_BG4CT
-	depends on OF
  	bool "Marvell berlin4ct pin controller driver"
+	depends on OF
  	select PINCTRL_BERLIN
 
  endif

Antoine Tenart

author

2015-10-16 06:39 UTC #11 lore raw

Re: [PATCH 4/5] pinctrl: berlin: Kconfig clean up

Sebastian,

Quoted 9 lines · Sebastian Hesselbarth

Quoted 4 lines · Antoine Tenart
Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing.
Signed-off-by Antoine Tenart <[email protected]>
If this is the only patch that requires the dependency with Jisheng's pending patches, can you two agree on squashing it into Jisheng's patch set?

Yes, this is the only one. Squashing them would be great!

Antoine

Signature · 3 lines

Antoine T?nart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Linus Walleij

2015-10-16 14:22 UTC #12 lore raw

Re: [PATCH 4/5] pinctrl: berlin: Kconfig clean up

In reply to Antoine Tenart

Quoted 4 lines · Antoine Tenart

Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing.
Signed-off-by Antoine Tenart <[email protected]>

I assume this was squashed into Jisheng's patchset as mentioned in the thread because it doesn't apply after I applied Jisheng's v7 patches.

So dropping this.

Yours,
Linus Walleij

Antoine Tenart

author

2015-10-16 14:33 UTC #13 lore raw

Re: [PATCH 4/5] pinctrl: berlin: Kconfig clean up

Linus,

Quoted 11 lines · Linus Walleij

Quoted 4 lines · Antoine Tenart
Reorder the statements under the PINCTRL_BERLIN_BG4CT config option to be consistent with the existing.
Signed-off-by Antoine Tenart <[email protected]>
I assume this was squashed into Jisheng's patchset as mentioned in the thread because it doesn't apply after I applied Jisheng's v7 patches.

Yes, this was squashed into Jisheng's series.

Antoine

Signature · 3 lines

Antoine T?nart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Antoine Tenart

author

2015-10-13 21:31 UTC #14 lore raw

PATCH 5/5 pinctrl: berlin: fix my family name spelling

In reply to Antoine Tenart

My family name contained an accent when I submitted the Berlin pinctrl series in the first place. There was an encoding issue when the series was applied. Fix this.

Signed-off-by Antoine Tenart <[email protected]>

---
 drivers/pinctrl/berlin/berlin-bg2.c   | 4 ++--
 drivers/pinctrl/berlin/berlin-bg2cd.c | 4 ++--
 drivers/pinctrl/berlin/berlin-bg2q.c  | 4 ++--
 drivers/pinctrl/berlin/berlin.c       | 2 +-
 drivers/pinctrl/berlin/berlin.h       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

drivers/pinctrl/berlin/berlin-bg2.c +2 -2

index 274c5535b531..cfbf22a496ca 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

@@ -246,6 +246,6 @@ static struct platform_driver berlin2_pinctrl_driver = {
 };
 module_platform_driver(berlin2_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
 MODULE_DESCRIPTION("Marvell Berlin BG2 pinctrl driver");
 MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin-bg2cd.c +2 -2

index 0cb793a3552a..77f4f30cc686 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

@@ -189,6 +189,6 @@ static struct platform_driver berlin2cd_pinctrl_driver = {
 };
 module_platform_driver(berlin2cd_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
 MODULE_DESCRIPTION("Marvell Berlin BG2CD pinctrl driver");
 MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin-bg2q.c +2 -2

index a466054a8206..66fffe6fab8d 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

@@ -408,6 +408,6 @@ static struct platform_driver berlin2q_pinctrl_driver = {
 };
 module_platform_driver(berlin2q_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
 MODULE_DESCRIPTION("Marvell Berlin BG2Q pinctrl driver");
 MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin.c +1 -1

index f49580617055..ebd6f78a6dde 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

drivers/pinctrl/berlin/berlin.h +1 -1

index e1aa84145194..94495d304005 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any

Signature · 1 line

2.6.1

Sebastian Hesselbarth

maintainer Acked-by on v1 5/5

2015-10-15 21:45 UTC #15 lore raw

Re: [PATCH 5/5] pinctrl: berlin: fix my family name spelling

Quoted 5 lines · Antoine Tenart

My family name contained an accent when I submitted the Berlin pinctrl series in the first place. There was an encoding issue when the series was applied. Fix this.
Signed-off-by Antoine Tenart <[email protected]>

Acked-by Sebastian Hesselbarth <[email protected]>

and sorry for the non-UTF-8 mess.

Sebastian

Quoted 98 lines

---
  drivers/pinctrl/berlin/berlin-bg2.c   | 4 ++--
  drivers/pinctrl/berlin/berlin-bg2cd.c | 4 ++--
  drivers/pinctrl/berlin/berlin-bg2q.c  | 4 ++--
  drivers/pinctrl/berlin/berlin.c       | 2 +-
  drivers/pinctrl/berlin/berlin.h       | 2 +-
  5 files changed, 8 insertions(+), 8 deletions(-)

drivers/pinctrl/berlin/berlin-bg2.c +2 -2

index 274c5535b531..cfbf22a496ca 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Marvell Technology Group Ltd.
   *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
   *
   * This file is licensed under the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any

@@ -246,6 +246,6 @@ static struct platform_driver berlin2_pinctrl_driver = {
  };
  module_platform_driver(berlin2_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
  MODULE_DESCRIPTION("Marvell Berlin BG2 pinctrl driver");
  MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin-bg2cd.c +2 -2

index 0cb793a3552a..77f4f30cc686 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Marvell Technology Group Ltd.
   *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
   *
   * This file is licensed under the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any

@@ -189,6 +189,6 @@ static struct platform_driver berlin2cd_pinctrl_driver = {
  };
  module_platform_driver(berlin2cd_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
  MODULE_DESCRIPTION("Marvell Berlin BG2CD pinctrl driver");
  MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin-bg2q.c +2 -2

index a466054a8206..66fffe6fab8d 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Marvell Technology Group Ltd.
   *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
   *
   * This file is licensed under the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any

@@ -408,6 +408,6 @@ static struct platform_driver berlin2q_pinctrl_driver = {
  };
  module_platform_driver(berlin2q_pinctrl_driver);
 
-MODULE_AUTHOR("Antoine T??nart <[email protected]>");
+MODULE_AUTHOR("Antoine Tenart <[email protected]>");
  MODULE_DESCRIPTION("Marvell Berlin BG2Q pinctrl driver");
  MODULE_LICENSE("GPL");

drivers/pinctrl/berlin/berlin.c +1 -1

index f49580617055..ebd6f78a6dde 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Marvell Technology Group Ltd.
   *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
   *
   * This file is licensed under the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any

drivers/pinctrl/berlin/berlin.h +1 -1

index e1aa84145194..94495d304005 100644
@@ -3,7 +3,7 @@
   *
   * Copyright (C) 2014 Marvell Technology Group Ltd.
   *
- * Antoine T??nart <[email protected]>
+ * Antoine Tenart <[email protected]>
   *
   * This file is licensed under the terms of the GNU General Public
   * License version 2. This program is licensed "as is" without any

Linus Walleij

2015-10-16 14:32 UTC #16 lore raw

Re: [PATCH 5/5] pinctrl: berlin: fix my family name spelling

In reply to Antoine Tenart

Quoted 5 lines · Antoine Tenart

My family name contained an accent when I submitted the Berlin pinctrl series in the first place. There was an encoding issue when the series was applied. Fix this.
Signed-off-by Antoine Tenart <[email protected]>

Sorry probably I screwed this up when applying the patches.

I repaired all the acute accents so now your name should appear properly in the kernel source.

(Uwe Kleine-K?nig och andra ?r p? mig om detta, och jag vet, det ?r oerh?rt pinsamt att jag inte kan f? detta r?tt trots att jag sj?lv talar ett spr?k fullt med dylika bokstavsdekorationer.)

Yours,
Linus Walleij