[PATCH 0/5] pinctrl: berlin: clean up

[PATCH 0/5] pinctrl: berlin: clean up

[Antoine Tenart]

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(-)

-- 
2.6.1

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

[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 <antoine.tenart@free-electrons.com>
---
 drivers/pinctrl/berlin/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
index 740a13675fd1..7eb4bb615867 100644
--- a/drivers/pinctrl/berlin/Kconfig
+++ b/drivers/pinctrl/berlin/Kconfig
@@ -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
-- 
2.6.1

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

[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 <antoine.tenart@free-electrons.com>
---
 arch/arm/mach-berlin/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 742d53a5f7f9..344434ca366c 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -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
-- 
2.6.1

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

[Antoine Tenart]

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

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/pinctrl/berlin/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
index 7eb4bb615867..cf95b4d7f7e3 100644
--- a/drivers/pinctrl/berlin/Kconfig
+++ b/drivers/pinctrl/berlin/Kconfig
@@ -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
-- 
2.6.1

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

[Antoine Tenart]

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

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/pinctrl/berlin/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
index cf95b4d7f7e3..8fe6ad7795dc 100644
--- a/drivers/pinctrl/berlin/Kconfig
+++ b/drivers/pinctrl/berlin/Kconfig
@@ -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
-- 
2.6.1

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

[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 <antoine.tenart@free-electrons.com>
---
 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(-)

diff --git a/drivers/pinctrl/berlin/berlin-bg2.c b/drivers/pinctrl/berlin/berlin-bg2.c
index 274c5535b531..cfbf22a496ca 100644
--- a/drivers/pinctrl/berlin/berlin-bg2.c
+++ b/drivers/pinctrl/berlin/berlin-bg2.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <antoine.tenart@free-electrons.com>
+ * Antoine Tenart <antoine.tenart@free-electrons.com>
  *
  * 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 <antoine.tenart@free-electrons.com>");
+MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
 MODULE_DESCRIPTION("Marvell Berlin BG2 pinctrl driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c
index 0cb793a3552a..77f4f30cc686 100644
--- a/drivers/pinctrl/berlin/berlin-bg2cd.c
+++ b/drivers/pinctrl/berlin/berlin-bg2cd.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <antoine.tenart@free-electrons.com>
+ * Antoine Tenart <antoine.tenart@free-electrons.com>
  *
  * 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 <antoine.tenart@free-electrons.com>");
+MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
 MODULE_DESCRIPTION("Marvell Berlin BG2CD pinctrl driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c
index a466054a8206..66fffe6fab8d 100644
--- a/drivers/pinctrl/berlin/berlin-bg2q.c
+++ b/drivers/pinctrl/berlin/berlin-bg2q.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <antoine.tenart@free-electrons.com>
+ * Antoine Tenart <antoine.tenart@free-electrons.com>
  *
  * 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 <antoine.tenart@free-electrons.com>");
+MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
 MODULE_DESCRIPTION("Marvell Berlin BG2Q pinctrl driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
index f49580617055..ebd6f78a6dde 100644
--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <antoine.tenart@free-electrons.com>
+ * Antoine Tenart <antoine.tenart@free-electrons.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h
index e1aa84145194..94495d304005 100644
--- a/drivers/pinctrl/berlin/berlin.h
+++ b/drivers/pinctrl/berlin/berlin.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Marvell Technology Group Ltd.
  *
- * Antoine T??nart <antoine.tenart@free-electrons.com>
+ * Antoine Tenart <antoine.tenart@free-electrons.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
-- 
2.6.1

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

[Sebastian Hesselbarth]

On 13.10.2015 23:31, Antoine Tenart wrote:
> 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 <antoine.tenart@free-electrons.com>

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

and sorry for the non-UTF-8 mess.

Sebastian

> ---
>   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(-)
>
> diff --git a/drivers/pinctrl/berlin/berlin-bg2.c b/drivers/pinctrl/berlin/berlin-bg2.c
> index 274c5535b531..cfbf22a496ca 100644
> --- a/drivers/pinctrl/berlin/berlin-bg2.c
> +++ b/drivers/pinctrl/berlin/berlin-bg2.c
> @@ -3,7 +3,7 @@
>    *
>    * Copyright (C) 2014 Marvell Technology Group Ltd.
>    *
> - * Antoine T??nart <antoine.tenart@free-electrons.com>
> + * Antoine Tenart <antoine.tenart@free-electrons.com>
>    *
>    * 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 <antoine.tenart@free-electrons.com>");
> +MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
>   MODULE_DESCRIPTION("Marvell Berlin BG2 pinctrl driver");
>   MODULE_LICENSE("GPL");
> diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c
> index 0cb793a3552a..77f4f30cc686 100644
> --- a/drivers/pinctrl/berlin/berlin-bg2cd.c
> +++ b/drivers/pinctrl/berlin/berlin-bg2cd.c
> @@ -3,7 +3,7 @@
>    *
>    * Copyright (C) 2014 Marvell Technology Group Ltd.
>    *
> - * Antoine T??nart <antoine.tenart@free-electrons.com>
> + * Antoine Tenart <antoine.tenart@free-electrons.com>
>    *
>    * 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 <antoine.tenart@free-electrons.com>");
> +MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
>   MODULE_DESCRIPTION("Marvell Berlin BG2CD pinctrl driver");
>   MODULE_LICENSE("GPL");
> diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c
> index a466054a8206..66fffe6fab8d 100644
> --- a/drivers/pinctrl/berlin/berlin-bg2q.c
> +++ b/drivers/pinctrl/berlin/berlin-bg2q.c
> @@ -3,7 +3,7 @@
>    *
>    * Copyright (C) 2014 Marvell Technology Group Ltd.
>    *
> - * Antoine T??nart <antoine.tenart@free-electrons.com>
> + * Antoine Tenart <antoine.tenart@free-electrons.com>
>    *
>    * 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 <antoine.tenart@free-electrons.com>");
> +MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
>   MODULE_DESCRIPTION("Marvell Berlin BG2Q pinctrl driver");
>   MODULE_LICENSE("GPL");
> diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
> index f49580617055..ebd6f78a6dde 100644
> --- a/drivers/pinctrl/berlin/berlin.c
> +++ b/drivers/pinctrl/berlin/berlin.c
> @@ -3,7 +3,7 @@
>    *
>    * Copyright (C) 2014 Marvell Technology Group Ltd.
>    *
> - * Antoine T??nart <antoine.tenart@free-electrons.com>
> + * Antoine Tenart <antoine.tenart@free-electrons.com>
>    *
>    * This file is licensed under the terms of the GNU General Public
>    * License version 2. This program is licensed "as is" without any
> diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h
> index e1aa84145194..94495d304005 100644
> --- a/drivers/pinctrl/berlin/berlin.h
> +++ b/drivers/pinctrl/berlin/berlin.h
> @@ -3,7 +3,7 @@
>    *
>    * Copyright (C) 2014 Marvell Technology Group Ltd.
>    *
> - * Antoine T??nart <antoine.tenart@free-electrons.com>
> + * Antoine Tenart <antoine.tenart@free-electrons.com>
>    *
>    * This file is licensed under the terms of the GNU General Public
>    * License version 2. This program is licensed "as is" without any
>

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

[Sebastian Hesselbarth]

On 13.10.2015 23:31, Antoine Tenart wrote:
> Reorder the statements under the PINCTRL_BERLIN_BG4CT config
> option to be consistent with the existing.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

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

> ---
>   drivers/pinctrl/berlin/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
> index cf95b4d7f7e3..8fe6ad7795dc 100644
> --- a/drivers/pinctrl/berlin/Kconfig
> +++ b/drivers/pinctrl/berlin/Kconfig
> @@ -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
>

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

[Sebastian Hesselbarth]

On 13.10.2015 23:31, Antoine Tenart wrote:
> 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 <antoine.tenart@free-electrons.com>

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

> ---
>   drivers/pinctrl/berlin/Kconfig | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/berlin/Kconfig b/drivers/pinctrl/berlin/Kconfig
> index 740a13675fd1..7eb4bb615867 100644
> --- a/drivers/pinctrl/berlin/Kconfig
> +++ b/drivers/pinctrl/berlin/Kconfig
> @@ -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
>

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

[Antoine Tenart]

Sebastian,

On Thu, Oct 15, 2015 at 11:46:15PM +0200, Sebastian Hesselbarth wrote:
> On 13.10.2015 23:31, Antoine Tenart wrote:
> >Reorder the statements under the PINCTRL_BERLIN_BG4CT config
> >option to be consistent with the existing.
> >
> >Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> 
> 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

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

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

[Linus Walleij]

On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> 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 <antoine.tenart@free-electrons.com>

Patch applied with Sebastian's ACK.

Yours,
Linus Walleij

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

[Linus Walleij]

On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> 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 <antoine.tenart@free-electrons.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

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

Yours,
Linus Walleij

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

[Linus Walleij]

On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> Berlin pinctrl drivers depends on CONFIG_OF. This patch adds
> this dependency explicitly.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Patch applied.

Yours,
Linus Walleij

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

[Linus Walleij]

On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> Reorder the statements under the PINCTRL_BERLIN_BG4CT config
> option to be consistent with the existing.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

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

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

[Linus Walleij]

On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> 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 <antoine.tenart@free-electrons.com>

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

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

[Antoine Tenart]

Linus,

On Fri, Oct 16, 2015 at 04:22:35PM +0200, Linus Walleij wrote:
> On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
> <antoine.tenart@free-electrons.com> wrote:
> 
> > Reorder the statements under the PINCTRL_BERLIN_BG4CT config
> > option to be consistent with the existing.
> >
> > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> 
> 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

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

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

[Sebastian Hesselbarth]

On 16.10.2015 16:19, Linus Walleij wrote:
> On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
> <antoine.tenart@free-electrons.com> wrote:
>
>> 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 <antoine.tenart@free-electrons.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I can't merge this patch, take it through ARM SoC with other
> Marvell stuff.

Applied to berlin/soc with Linus' Ack.

Thanks,
   Sebastian