diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-29 14:04:22 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-29 14:08:04 -0800 |
| commit | ee481c84fa0675c94fd4443f6da5be836664d821 (patch) | |
| tree | 8fade8c7f83d0ae54d112ad32178a0c790c894c8 /arch/arm/Kconfig | |
| parent | ff6a8168d2e57cf36c10b8add6ae5773c02babdc (diff) | |
| parent | 3329659df0300d1d0aa22f5e7063f83a88ef92aa (diff) | |
| download | linux-ee481c84fa0675c94fd4443f6da5be836664d821.tar.bz2 | |
Merge tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/soc
Merge "Zynq SoC changes for 3.20" from Michal Simek:
arm: Xilinx Zynq SoC patches for v3.20
- Enable pincontrol
- Simplified SLCR initialization
- Setup default ARCH_NR_GPIO
* tag 'zynq-soc-for-3.20' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: Simplify SLCR initialization
ARM: zynq: PM: Fixed simple typo.
ARM: zynq: Setup default gpio number for Xilinx Zynq
ARM: zynq: Enable pinctrl
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 86e2202565e6..f5dd6e970f53 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1490,7 +1490,7 @@ config ARM_PSCI # selected platforms. config ARCH_NR_GPIO int - default 1024 if ARCH_SHMOBILE || ARCH_TEGRA + default 1024 if ARCH_SHMOBILE || ARCH_TEGRA || ARCH_ZYNQ default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \ SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 default 416 if ARCH_SUNXI |