| Message ID | 1362807578-23089-2-git-send-email-linux@prisktech.co.nz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Mar 09, 2013 at 06:39:33PM +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. There is a patch from Maxime Ripard in February fixing the broken orering of these options. It was sent to Arnd and Olof - but was it merged? Arnd/Olof needs to merge for -rc and people need to take note of it (it will conflict for example with your patch.)
On Mon, 2013-03-11 at 16:38 +0000, Russell King - ARM Linux wrote: > On Sat, Mar 09, 2013 at 06:39:33PM +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. > > There is a patch from Maxime Ripard in February fixing the broken > orering of these options. It was sent to Arnd and Olof - but was it > merged? Arnd/Olof needs to merge for -rc and people need to take > note of it (it will conflict for example with your patch.) > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel I was aware of the patch to reorder the gpio numbering, and my patch originally reordered them as well then I realised I should undo it to avoid complicating things. Quite happy to rebase this on a later -rc once the original patch is merged. 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(-)