diff mbox

[1/3] pinctrl: exynos: add exynos5250 SoC specific data

Message ID 017801cde453$77b03eb0$6710bc10$@samsung.com
State New
Headers show

Commit Message

Kukjin Kim Dec. 27, 2012, 4:58 p.m. UTC
Thomas Abraham wrote:
> 
> Hi Linus,
> 
> On 14 December 2012 21:21, Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Thu, Dec 13, 2012 at 12:54 PM, Thomas Abraham
> > <thomas.abraham@linaro.org> wrote:
> >
> >> Add Samsung Exynos5250 SoC specific data to enable pinctrl support for
> >> all platforms based on Exynos5250.
> >>
> >> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
> >
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > For this series, I guess you'll fix it through the Samsung tree?
> 
> Thanks for your ack. Since there are patches to be prepared for
> migrating the rest of Exynos5250 related code to the pinctrl
> framework, it would be easier if this series goes through the Samsung
> tree.
> 
I applied this series, thanks.

And I think, would be clear if the config could be changed like following.

8<----------------------------------------------------------------------
From: Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH] pinctrl: exynos: change PINCTRL_EXYNOS option

Since pinctrl-exynos can support exynos4 and exynos5 so changed
the option name to PINCTRL_EXYNOS for more clarity.

Cc: Thomas Abraham <Thomas.abraham@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
8<----------------------------------------------------------------------

- Kukjin

Comments

Linus Walleij Jan. 6, 2013, 11:31 p.m. UTC | #1
On Thu, Dec 27, 2012 at 5:58 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:

> And I think, would be clear if the config could be changed like following.
>
> 8<----------------------------------------------------------------------
> From: Kukjin Kim <kgene.kim@samsung.com>
> Subject: [PATCH] pinctrl: exynos: change PINCTRL_EXYNOS option
>
> Since pinctrl-exynos can support exynos4 and exynos5 so changed
> the option name to PINCTRL_EXYNOS for more clarity.
>
> Cc: Thomas Abraham <Thomas.abraham@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

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

Shall I take this into the pinctrl tree?

Yours,
Linus Walleij
Kukjin Kim Jan. 10, 2013, 1:29 a.m. UTC | #2
Linus Walleij wrote:
> 
> On Thu, Dec 27, 2012 at 5:58 PM, Kukjin Kim <kgene.kim@samsung.com>
> wrote:
> 
> > And I think, would be clear if the config could be changed like
following.
> >
> > 8<----------------------------------------------------------------------
> > From: Kukjin Kim <kgene.kim@samsung.com>
> > Subject: [PATCH] pinctrl: exynos: change PINCTRL_EXYNOS option
> >
> > Since pinctrl-exynos can support exynos4 and exynos5 so changed
> > the option name to PINCTRL_EXYNOS for more clarity.
> >
> > Cc: Thomas Abraham <Thomas.abraham@linaro.org>
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Shall I take this into the pinctrl tree?
> 
Yes, please :-)

Just note, regarding Samsung pinctrl changes in the following:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/pinctrl-exynos

Thanks.

- Kukjin
Linus Walleij Jan. 18, 2013, 7:36 p.m. UTC | #3
On Thu, Jan 10, 2013 at 2:29 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Linus Walleij wrote:
>> On Thu, Dec 27, 2012 at 5:58 PM, Kukjin Kim <kgene.kim@samsung.com>
>> wrote:
>>
>> > And I think, would be clear if the config could be changed like
> following.
>> >
>> > 8<----------------------------------------------------------------------
>> > From: Kukjin Kim <kgene.kim@samsung.com>
>> > Subject: [PATCH] pinctrl: exynos: change PINCTRL_EXYNOS option
>> >
>> > Since pinctrl-exynos can support exynos4 and exynos5 so changed
>> > the option name to PINCTRL_EXYNOS for more clarity.
>> >
>> > Cc: Thomas Abraham <Thomas.abraham@linaro.org>
>> > Cc: Linus Walleij <linus.walleij@linaro.org>
>> > Cc: Grant Likely <grant.likely@secretlab.ca>
>> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> Shall I take this into the pinctrl tree?
>>
> Yes, please :-)

OK I did.

> Just note, regarding Samsung pinctrl changes in the following:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/pinctrl-exynos

Hm. I had to use patch -p1 < ... to apply the patch, which indicates
there may be merge clashes.

Anyway, it's merged now.

Yours,
Linus Walleij
thomas.abraham@linaro.org March 5, 2013, 6:24 p.m. UTC | #4
On 27 December 2012 22:28, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Thomas Abraham wrote:
>>
>> Hi Linus,
>>
>> On 14 December 2012 21:21, Linus Walleij <linus.walleij@linaro.org> wrote:
>> > On Thu, Dec 13, 2012 at 12:54 PM, Thomas Abraham
>> > <thomas.abraham@linaro.org> wrote:
>> >
>> >> Add Samsung Exynos5250 SoC specific data to enable pinctrl support for
>> >> all platforms based on Exynos5250.
>> >>
>> >> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
>> >
>> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
>> >
>> > For this series, I guess you'll fix it through the Samsung tree?
>>
>> Thanks for your ack. Since there are patches to be prepared for
>> migrating the rest of Exynos5250 related code to the pinctrl
>> framework, it would be easier if this series goes through the Samsung
>> tree.
>>
> I applied this series, thanks.

This series has not made it into 3.9-rc1. So I will rebase this series
to 3.9-rc1 and post again.

Thanks,
Thomas.

>
> And I think, would be clear if the config could be changed like following.
>
> 8<----------------------------------------------------------------------
> From: Kukjin Kim <kgene.kim@samsung.com>
> Subject: [PATCH] pinctrl: exynos: change PINCTRL_EXYNOS option
>
> Since pinctrl-exynos can support exynos4 and exynos5 so changed
> the option name to PINCTRL_EXYNOS for more clarity.
>
> Cc: Thomas Abraham <Thomas.abraham@linaro.org>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
> ---
> diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
> index 91d5b6f..e1f63e7 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -412,7 +412,7 @@ config MACH_EXYNOS4_DT
>         select CPU_EXYNOS4210
>         select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
>         select PINCTRL
> -       select PINCTRL_EXYNOS4
> +       select PINCTRL_EXYNOS
>         select USE_OF
>         help
>           Machine support for Samsung Exynos4 machine with device tree
> enabled.
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index c31aeb0..f59feab 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -185,8 +185,8 @@ config PINCTRL_SAMSUNG
>         select PINMUX
>         select PINCONF
>
> -config PINCTRL_EXYNOS4
> -       bool "Pinctrl driver data for Exynos4 SoC"
> +config PINCTRL_EXYNOS
> +       bool "Pinctrl driver data for Samsung EXYNOS SoCs"
>         depends on OF && GPIOLIB
>         select PINCTRL_SAMSUNG
>
> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
> index fc4606f..6e87e52 100644
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@ -36,7 +36,7 @@ obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
>  obj-$(CONFIG_PINCTRL_U300)     += pinctrl-u300.o
>  obj-$(CONFIG_PINCTRL_COH901)   += pinctrl-coh901.o
>  obj-$(CONFIG_PINCTRL_SAMSUNG)  += pinctrl-samsung.o
> -obj-$(CONFIG_PINCTRL_EXYNOS4)  += pinctrl-exynos.o
> +obj-$(CONFIG_PINCTRL_EXYNOS)   += pinctrl-exynos.o
>  obj-$(CONFIG_PINCTRL_EXYNOS5440)       += pinctrl-exynos5440.o
>  obj-$(CONFIG_PINCTRL_XWAY)     += pinctrl-xway.o
>  obj-$(CONFIG_PINCTRL_LANTIQ)   += pinctrl-lantiq.o
> 8<----------------------------------------------------------------------
>
> - Kukjin
>
diff mbox

Patch

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 91d5b6f..e1f63e7 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -412,7 +412,7 @@  config MACH_EXYNOS4_DT
 	select CPU_EXYNOS4210
 	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
 	select PINCTRL
-	select PINCTRL_EXYNOS4
+	select PINCTRL_EXYNOS
 	select USE_OF
 	help
 	  Machine support for Samsung Exynos4 machine with device tree
enabled.
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c31aeb0..f59feab 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -185,8 +185,8 @@  config PINCTRL_SAMSUNG
 	select PINMUX
 	select PINCONF
 
-config PINCTRL_EXYNOS4
-	bool "Pinctrl driver data for Exynos4 SoC"
+config PINCTRL_EXYNOS
+	bool "Pinctrl driver data for Samsung EXYNOS SoCs"
 	depends on OF && GPIOLIB
 	select PINCTRL_SAMSUNG
 
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index fc4606f..6e87e52 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -36,7 +36,7 @@  obj-$(CONFIG_PINCTRL_TEGRA30)	+= pinctrl-tegra30.o
 obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o
 obj-$(CONFIG_PINCTRL_COH901)	+= pinctrl-coh901.o
 obj-$(CONFIG_PINCTRL_SAMSUNG)	+= pinctrl-samsung.o
-obj-$(CONFIG_PINCTRL_EXYNOS4)	+= pinctrl-exynos.o
+obj-$(CONFIG_PINCTRL_EXYNOS)	+= pinctrl-exynos.o
 obj-$(CONFIG_PINCTRL_EXYNOS5440)	+= pinctrl-exynos5440.o
 obj-$(CONFIG_PINCTRL_XWAY)	+= pinctrl-xway.o
 obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o