* [GIT PULL] prima2 GPIO support in pinmux
@ 2012-07-02 3:17 Barry Song
2012-07-02 7:55 ` Barry Song
2012-07-04 14:29 ` Arnd Bergmann
0 siblings, 2 replies; 7+ messages in thread
From: Barry Song @ 2012-07-02 3:17 UTC (permalink / raw)
To: linux-arm-kernel
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120702/8461aa4f/attachment-0001.html>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-02 3:17 [GIT PULL] prima2 GPIO support in pinmux Barry Song
@ 2012-07-02 7:55 ` Barry Song
2012-07-02 21:06 ` Arnd Bergmann
2012-07-02 21:11 ` Arnd Bergmann
2012-07-04 14:29 ` Arnd Bergmann
1 sibling, 2 replies; 7+ messages in thread
From: Barry Song @ 2012-07-02 7:55 UTC (permalink / raw)
To: linux-arm-kernel
Note this has been acked by Linus Walleij, he suggested to go through
prima2 arm-soc.
-barry
2012/7/2 Barry Song <21cnbao@gmail.com>:
> 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
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-02 7:55 ` Barry Song
@ 2012-07-02 21:06 ` Arnd Bergmann
2012-07-02 21:11 ` Arnd Bergmann
1 sibling, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2012-07-02 21:06 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-02 7:55 ` Barry Song
2012-07-02 21:06 ` Arnd Bergmann
@ 2012-07-02 21:11 ` Arnd Bergmann
1 sibling, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2012-07-02 21:11 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-02 3:17 [GIT PULL] prima2 GPIO support in pinmux Barry Song
2012-07-02 7:55 ` Barry Song
@ 2012-07-04 14:29 ` Arnd Bergmann
2012-07-04 14:36 ` Barry Song
1 sibling, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2012-07-04 14:29 UTC (permalink / raw)
To: linux-arm-kernel
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
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-04 14:29 ` Arnd Bergmann
@ 2012-07-04 14:36 ` Barry Song
2012-07-04 14:56 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Barry Song @ 2012-07-04 14:36 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] prima2 GPIO support in pinmux
2012-07-04 14:36 ` Barry Song
@ 2012-07-04 14:56 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2012-07-04 14:56 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-07-04 14:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-02 3:17 [GIT PULL] prima2 GPIO support in pinmux Barry Song
2012-07-02 7:55 ` Barry Song
2012-07-02 21:06 ` Arnd Bergmann
2012-07-02 21:11 ` Arnd Bergmann
2012-07-04 14:29 ` Arnd Bergmann
2012-07-04 14:36 ` Barry Song
2012-07-04 14:56 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.