Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

1 files changed, 19 insertions, 7 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aa6c91d0d794..7dc5986069ca 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -337,6 +337,19 @@ config ARCH_GEMINI
         help
           Support for the Cortina Systems Gemini family SoCs
 
+config ARCH_PRIMA2
+        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
+        select CPU_V7
+        select GENERIC_TIME
+        select NO_IOPORT
+        select GENERIC_CLOCKEVENTS
+        select CLKDEV_LOOKUP
+        select GENERIC_IRQ_CHIP
+        select USE_OF
+        select ZONE_DMA
+        help
+          Support for CSR SiRFSoC ARM Cortex A9 Platform
+
 config ARCH_EBSA110
         bool "EBSA-110"
         select CPU_SA110
@@ -880,19 +893,18 @@ config ARCH_VT8500
         help
           Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 
-config ARCH_PRIMA2
-        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
+config ARCH_ZYNQ
+        bool "Xilinx Zynq ARM Cortex A9 Platform"
         select CPU_V7
         select GENERIC_TIME
-        select NO_IOPORT
         select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
-        select GENERIC_IRQ_CHIP
+        select ARM_GIC
+        select ARM_AMBA
+        select ICST
         select USE_OF
-        select ZONE_DMA
         help
-          Support for CSR SiRFSoC ARM Cortex A9 Platform
-
+          Support for Xilinx Zynq ARM Cortex A9 Platform
 endchoice
 
 #