1 files changed, 54 insertions, 7 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 84449dd8f031..b25c9d3c379a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -250,16 +250,36 @@ choice
         prompt "ARM system type"
         default ARCH_VERSATILE
 
+config ARCH_SOCFPGA
+        bool "Altera SOCFPGA family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_AMBA
+        select ARM_GIC
+        select CACHE_L2X0
+        select CLKDEV_LOOKUP
+        select COMMON_CLK
+        select CPU_V7
+        select DW_APB_TIMER
+        select DW_APB_TIMER_OF
+        select GENERIC_CLOCKEVENTS
+        select GPIO_PL061 if GPIOLIB
+        select HAVE_ARM_SCU
+        select SPARSE_IRQ
+        select USE_OF
+        help
+          This enables support for Altera SOCFPGA Cyclone V platform
+
 config ARCH_INTEGRATOR
         bool "ARM Ltd. Integrator family"
         select ARM_AMBA
         select ARCH_HAS_CPUFREQ
-        select CLKDEV_LOOKUP
-        select HAVE_MACH_CLKDEV
+        select COMMON_CLK
+        select CLK_VERSATILE
         select HAVE_TCM
         select ICST
         select GENERIC_CLOCKEVENTS
         select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_FPGA_IRQ
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
@@ -277,6 +297,7 @@ config ARCH_REALVIEW
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_CLCD
         select ARM_TIMER_SP804
         select GPIO_PL061 if GPIOLIB
@@ -293,7 +314,9 @@ config ARCH_VERSATILE
         select ICST
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select NEED_MACH_IO_H if PCI
         select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_CLCD
         select PLAT_VERSATILE_FPGA_IRQ
         select ARM_TIMER_SP804
@@ -306,14 +329,16 @@ config ARCH_VEXPRESS
         select ARM_AMBA
         select ARM_TIMER_SP804
         select CLKDEV_LOOKUP
-        select HAVE_MACH_CLKDEV
+        select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select HAVE_CLK
         select HAVE_PATA_PLATFORM
         select ICST
         select NO_IOPORT
         select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_CLCD
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           This enables support for the ARM Ltd Versatile Express boards.
 
@@ -348,6 +373,7 @@ config ARCH_HIGHBANK
         select ARM_TIMER_SP804
         select CACHE_L2X0
         select CLKDEV_LOOKUP
+        select COMMON_CLK
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU
@@ -388,6 +414,7 @@ config ARCH_PRIMA2
         bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
         select CPU_V7
         select NO_IOPORT
+        select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
         select GENERIC_IRQ_CHIP
@@ -446,6 +473,8 @@ config ARCH_MXC
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
         select MULTI_IRQ_HANDLER
+        select SPARSE_IRQ
+        select USE_OF
         help
           Support for Freescale MXC/iMX-based family of processors
 
@@ -532,6 +561,18 @@ config ARCH_IXP4XX
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
+config ARCH_MVEBU
+        bool "Marvell SOCs with Device Tree support"
+        select GENERIC_CLOCKEVENTS
+        select MULTI_IRQ_HANDLER
+        select SPARSE_IRQ
+        select CLKSRC_MMIO
+        select GENERIC_IRQ_CHIP
+        select IRQ_DOMAIN
+        select COMMON_CLK
+        help
+          Support for the Marvell SoC Family with device tree support
+
 config ARCH_DOVE
         bool "Marvell Dove"
         select CPU_V7
@@ -566,6 +607,7 @@ config ARCH_LPC32XX
         select CLKDEV_LOOKUP
         select GENERIC_CLOCKEVENTS
         select USE_OF
+        select HAVE_PWM
         help
           Support for the NXP LPC32XX family of processors
 
@@ -588,6 +630,7 @@ config ARCH_ORION5X
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_IO_H
         select PLAT_ORION
         help
           Support for the following Marvell Orion 5x series SoCs:
@@ -645,6 +688,7 @@ config ARCH_TEGRA
         select MIGHT_HAVE_CACHE_L2X0
         select NEED_MACH_IO_H if PCI
         select ARCH_HAS_CPUFREQ
+        select USE_OF
         help
           This enables support for NVIDIA Tegra based systems (Tegra APX,
           Tegra 6xx and Tegra 2 series).
@@ -656,6 +700,7 @@ config ARCH_PICOXCELL
         select ARM_VIC
         select CPU_V6K
         select DW_APB_TIMER
+        select DW_APB_TIMER_OF
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
         select HAVE_TCM
@@ -886,7 +931,7 @@ config ARCH_U300
         select ARM_VIC
         select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
-        select HAVE_MACH_CLKDEV
+        select COMMON_CLK
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
         help
@@ -911,7 +956,7 @@ config ARCH_NOMADIK
         select ARM_AMBA
         select ARM_VIC
         select CPU_ARM926T
-        select CLKDEV_LOOKUP
+        select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         select PINCTRL
         select MIGHT_HAVE_CACHE_L2X0
@@ -934,6 +979,7 @@ config ARCH_DAVINCI
 
 config ARCH_OMAP
         bool "TI OMAP"
+        depends on MMU
         select HAVE_CLK
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_HAS_CPUFREQ
@@ -985,6 +1031,8 @@ endchoice
 # Kconfigs may be included either alphabetically (according to the
 # plat- suffix) or along side the corresponding mach-* source.
 #
+source "arch/arm/mach-mvebu/Kconfig"
+
 source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/mach-bcmring/Kconfig"
@@ -1019,8 +1067,6 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
-source "arch/arm/mach-lpc32xx/Kconfig"
-
 source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"
@@ -1579,6 +1625,7 @@ config ARCH_NR_GPIO
         default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
         default 355 if ARCH_U8500
         default 264 if MACH_H4700
+        default 512 if SOC_OMAP5
         default 0
         help
           Maximum number of GPIOs in the system.