| Message ID | 1364015633-18580-3-git-send-email-linux@prisktech.co.nz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 23, 2013 at 06:13:48PM +1300, Tony Prisk wrote: > With the inclusion of the pin control driver, more GPIO pins have been > identified on the arch-vt8500 SoCs requiring an increase in the available > GPIOs. > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > --- > arch/arm/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 5b71469..c5dd0c2 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1661,9 +1661,10 @@ config ARCH_NR_GPIO > int > default 1024 if ARCH_SHMOBILE || ARCH_TEGRA > default 355 if ARCH_U8500 > + default 352 if ARCH_VT8500 > default 264 if MACH_H4700 > default 512 if SOC_OMAP5 > - default 288 if ARCH_VT8500 || ARCH_SUNXI > + default 288 if ARCH_SUNXI Note that the ordering of this has been fixed in -rc, so the above will cause a merge conflict. You may wish to consider basing your patch set on a later kernel version.
On Sat, 2013-03-23 at 10:44 +0000, Russell King - ARM Linux wrote: > On Sat, Mar 23, 2013 at 06:13:48PM +1300, Tony Prisk wrote: > > With the inclusion of the pin control driver, more GPIO pins have been > > identified on the arch-vt8500 SoCs requiring an increase in the available > > GPIOs. > > > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > --- > > arch/arm/Kconfig | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index 5b71469..c5dd0c2 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -1661,9 +1661,10 @@ config ARCH_NR_GPIO > > int > > default 1024 if ARCH_SHMOBILE || ARCH_TEGRA > > default 355 if ARCH_U8500 > > + default 352 if ARCH_VT8500 > > default 264 if MACH_H4700 > > default 512 if SOC_OMAP5 > > - default 288 if ARCH_VT8500 || ARCH_SUNXI > > + default 288 if ARCH_SUNXI > > Note that the ordering of this has been fixed in -rc, so the above will > cause a merge conflict. You may wish to consider basing your patch set > on a later kernel version. Thanks Russell, I didn't think to check for -rc3 just yet. My bad. Will rebase to -rc3+ before I post the next version. Regards Tony P
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5b71469..c5dd0c2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1661,9 +1661,10 @@ config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA default 355 if ARCH_U8500 + default 352 if ARCH_VT8500 default 264 if MACH_H4700 default 512 if SOC_OMAP5 - default 288 if ARCH_VT8500 || ARCH_SUNXI + default 288 if ARCH_SUNXI default 0 help Maximum number of GPIOs in the system.
With the inclusion of the pin control driver, more GPIO pins have been identified on the arch-vt8500 SoCs requiring an increase in the available GPIOs. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)