Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1cb5e66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_updates_for_v4.13' of... 

Merge tag 'socfpga_updates_for_v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc

Pull "SoCFPGA updates for v4.13" from Dinh Nguyen:

- Increase number of available GPIOs in Kconfig

* tag 'socfpga_updates_for_v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: Increase max number of GPIOs
parents 17bc093e 139358be

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,7 @@ config ARM_PSCI 
# selected platforms.

config ARCH_NR_GPIO

	int

	default 2048 if ARCH_SOCFPGA

	default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || ARCH_TEGRA || \

		ARCH_ZYNQ

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \