diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-18 07:23:04 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-18 07:23:04 (GMT) |
| commit | 99ff1830426ed59cc722091eadffd17736bdf148 (patch) | |
| tree | c6e2bed35a3233528223d5e57857452e55662f5c /arch/arm/Kconfig | |
| parent | 7bf15412250747277cc53301d550d4894f749b12 (diff) | |
| parent | f07cb6a089644e2334c3523af589d9233cc18c74 (diff) | |
| download | linux-fsl-qoriq-99ff1830426ed59cc722091eadffd17736bdf148.tar.xz | |
Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
From Santosh Shilimkar:
SOC support for Keystone II devices:
- Minimal machine and device-tree support with arch_timers and console UART
- Reboot hook using PLL reset
- Low level debug support using UART
- SMP boot support
* tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: Enable SMP support on Keystone machines
ARM: keystone: Add minimal TI Keystone platform support
ARM: dts: keystone: Add minimal Keystone SOC device tree data
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6cdf8bd..2ca6d73 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -950,6 +950,8 @@ source "arch/arm/mach-iop13xx/Kconfig" source "arch/arm/mach-ixp4xx/Kconfig" +source "arch/arm/mach-keystone/Kconfig" + source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/mach-ks8695/Kconfig" @@ -1562,6 +1564,7 @@ config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA default 512 if SOC_OMAP5 + default 512 if ARCH_KEYSTONE default 392 if ARCH_U8500 default 352 if ARCH_VT8500 default 288 if ARCH_SUNXI |