[GIT,PULL] prima2 GPIO support in pinmux

Commit Message

Arnd Bergmann July 4, 2012, 2:29 p.m. UTC

On Monday 02 July 2012, Barry Song wrote:
> Hi Olof, Arnd,
> 
> Please pull the following GPIO support in pinmux for 3.6.

I noticed that the driver now requires gpiolib, so we need one
of these two patches. I think the first one is safer, but the
second one allows you to build without GPIOLIB if you want to
disable PINCTRL_SIRF.

	Arnd

Comments

Barry Song July 4, 2012, 2:36 p.m. UTC | #1

2012/7/4 Arnd Bergmann <[e-mail]>:
> On Monday 02 July 2012, Barry Song wrote:
>> Hi Olof, Arnd,
>>
>> Please pull the following GPIO support in pinmux for 3.6.
>
> I noticed that the driver now requires gpiolib, so we need one
> of these two patches. I think the first one is safer, but the
> second one allows you to build without GPIOLIB if you want to
> disable PINCTRL_SIRF.

yes. missed this. thanks!
i would have 1 because basically we will always have PINCTRL_SIRF.

>
>         Arnd
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 8bcda59..adef0da 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -389,7 +389,7 @@ config ARCH_PRIMA2
>         bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
>         select CPU_V7
>         select NO_IOPORT
> -       select ARCH_WANT_OPTIONAL_GPIOLIB
> +       select ARCH_REQUIRE_GPIOLIB
>         select GENERIC_CLOCKEVENTS
>         select CLKDEV_LOOKUP
>         select GENERIC_IRQ_CHIP
>
>
>
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 4c05fe8..5b51199 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -104,7 +104,7 @@ config PINCTRL_PXA910
>
>  config PINCTRL_SIRF
>         bool "CSR SiRFprimaII pin controller driver"
> -       depends on ARCH_PRIMA2
> +       depends on ARCH_PRIMA2 && GPIOLIB
>         select PINMUX
>
>  config PINCTRL_TEGRA

-barry

Arnd Bergmann July 4, 2012, 2:56 p.m. UTC | #2

On Wednesday 04 July 2012, Barry Song wrote:
> 2012/7/4 Arnd Bergmann <[e-mail]>:
> > On Monday 02 July 2012, Barry Song wrote:
> >> Hi Olof, Arnd,
> >>
> >> Please pull the following GPIO support in pinmux for 3.6.
> >
> > I noticed that the driver now requires gpiolib, so we need one
> > of these two patches. I think the first one is safer, but the
> > second one allows you to build without GPIOLIB if you want to
> > disable PINCTRL_SIRF.
> 
> yes. missed this. thanks!
> i would have 1 because basically we will always have PINCTRL_SIRF.

Ok, I take that as an Ack. I've applied the patch on top of your
series now.

Thanks for confirming,

	Arnd

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8bcda59..adef0da 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -389,7 +389,7 @@  config ARCH_PRIMA2
 	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
 	select CPU_V7
 	select NO_IOPORT
-	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
 	select CLKDEV_LOOKUP
 	select GENERIC_IRQ_CHIP



diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 4c05fe8..5b51199 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -104,7 +104,7 @@  config PINCTRL_PXA910
 
 config PINCTRL_SIRF
 	bool "CSR SiRFprimaII pin controller driver"
-	depends on ARCH_PRIMA2
+	depends on ARCH_PRIMA2 && GPIOLIB
 	select PINMUX
 
 config PINCTRL_TEGRA