| Message ID | CAGsJ_4xrk0w5aQy+ZSYZwQ3pW5My7dcHnDX57+985VTbdHXCzg@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On Monday 02 July 2012, Barry Song wrote: > > Note this has been acked by Linus Walleij, he suggested to go through > prima2 arm-soc. > Ok, I've pulled this into a new next/pinctrl branch for now, we'll see if there are other pinctrl changes going through arm-soc for 3.6, if not we can fold it into the next/drivers branch. I've added Linus' Acked-by to the merge changeset. Arnd
On Monday 02 July 2012, Barry Song wrote: > Note this has been acked by Linus Walleij, he suggested to go through > prima2 arm-soc. One more thing: You should really make sure your pull requests are based off -rc releases rather than some commit between two -rc versions. In this case, I've already taken it before I noticed and the only change after the -rc is Russell's ARM bug fixes, which is better than having non-ARM changes in there as well. Arnd
2012/7/4 Arnd Bergmann <arnd@arndb.de>: > 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
On Wednesday 04 July 2012, Barry Song wrote: > 2012/7/4 Arnd Bergmann <arnd@arndb.de>: > > 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
Hi Olof, Arnd, Please pull the following GPIO support in pinmux for 3.6. Regards, Barry The following changes since commit ca24a145573124732152daff105ba68cc9a2b545: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm(2012-07-01 11:02:25 -0700) are available in the git repository at: git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git prima2/drivers Barry Song (1): PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII arch/arm/Kconfig | 1 + arch/arm/mach-prima2/include/mach/gpio.h | 13 + arch/arm/mach-prima2/include/mach/irqs.h | 2 +- drivers/pinctrl/pinctrl-sirf.c | 489 +++++++++++++++++++++++++++++- 4 files changed, 503 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-prima2/include/mach/gpio.h