Merge branch 'imx/dt' into next/dt

diff --combined arch/arm/Kconfig
index 8ac7b996038c3401eb080c3109d8f6619f084ec9,09ebf0ba64fa5699a5703c6677ebb5e0fd26cb5a..2c71a8f3535a1400c2d187e7fa612e00995e6927
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -242,6 -242,7 +242,7 @@@ config ARCH_INTEGRATO
        select ARM_AMBA
        select ARCH_HAS_CPUFREQ
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select ICST
        select GENERIC_CLOCKEVENTS
        select PLAT_VERSATILE
@@@ -253,6 -254,7 +254,7 @@@ config ARCH_REALVIE
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select ICST
        select GENERIC_CLOCKEVENTS
        select ARCH_WANT_OPTIONAL_GPIOLIB
@@@ -268,6 -270,7 +270,7 @@@ config ARCH_VERSATIL
        select ARM_AMBA
        select ARM_VIC
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select ICST
        select GENERIC_CLOCKEVENTS
        select ARCH_WANT_OPTIONAL_GPIOLIB
@@@ -284,6 -287,7 +287,7 @@@ config ARCH_VEXPRES
        select ARM_AMBA
        select ARM_TIMER_SP804
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
        select HAVE_PATA_PLATFORM
@@@ -324,7 -328,7 +328,7 @@@ config ARCH_CLPS711
  
  config ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family"
-       select CPU_V6
+       select CPU_V6K
        select GENERIC_CLOCKEVENTS
        select ARM_GIC
        select MIGHT_HAVE_PCI
@@@ -340,6 -344,19 +344,19 @@@ config ARCH_GEMIN
        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
@@@ -379,6 -396,7 +396,7 @@@ config ARCH_MX
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+       select GENERIC_IRQ_CHIP
        select HAVE_SCHED_CLOCK
        help
          Support for Freescale MXC/iMX-based family of processors
@@@ -493,14 -511,6 +511,6 @@@ config ARCH_KIRKWOO
          Support for the following Marvell Kirkwood series SoCs:
          88F6180, 88F6192 and 88F6281.
  
- config ARCH_LOKI
-       bool "Marvell Loki (88RC8480)"
-       select CPU_FEROCEON
-       select GENERIC_CLOCKEVENTS
-       select PLAT_ORION
-       help
-         Support for the Marvell Loki (88RC8480) SoC.
- 
  config ARCH_LPC32XX
        bool "NXP LPC32XX"
        select CLKSRC_MMIO
@@@ -594,7 -604,6 +604,6 @@@ config ARCH_TEGR
        select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_SCHED_CLOCK
-       select ARCH_HAS_BARRIERS if CACHE_L2X0
        select ARCH_HAS_CPUFREQ
        help
          This enables support for NVIDIA Tegra based systems (Tegra APX,
@@@ -621,6 -630,8 +630,8 @@@ config ARCH_PX
        select TICK_ONESHOT
        select PLAT_PXA
        select SPARSE_IRQ
+       select AUTO_ZRELADDR
+       select MULTI_IRQ_HANDLER
        help
          Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
  
@@@ -641,6 -652,7 +652,7 @@@ config ARCH_SHMOBIL
        bool "Renesas SH-Mobile / R-Mobile"
        select HAVE_CLK
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select GENERIC_CLOCKEVENTS
        select NO_IOPORT
        select SPARSE_IRQ
@@@ -686,6 -698,7 +698,7 @@@ config ARCH_S3C241
        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select ARCH_USES_GETTIMEOFFSET
        select HAVE_S3C2410_I2C if I2C
        help
@@@ -703,6 -716,7 +716,7 @@@ config ARCH_S3C64X
        select CPU_V6
        select ARM_VIC
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select NO_IOPORT
        select ARCH_USES_GETTIMEOFFSET
        select ARCH_HAS_CPUFREQ
@@@ -727,6 -741,8 +741,8 @@@ config ARCH_S5P64X
        select CPU_V6
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
+       select CLKSRC_MMIO
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
@@@ -740,6 -756,7 +756,7 @@@ config ARCH_S5PC10
        bool "Samsung S5PC100"
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select CPU_V7
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_USES_GETTIMEOFFSET
@@@ -753,8 -770,11 +770,11 @@@ config ARCH_S5PV21
        bool "Samsung S5PV210/S5PC110"
        select CPU_V7
        select ARCH_SPARSEMEM_ENABLE
+       select ARCH_HAS_HOLES_MEMORYMODEL
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
+       select CLKSRC_MMIO
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
@@@ -769,8 -789,10 +789,10 @@@ config ARCH_EXYNOS
        bool "Samsung EXYNOS4"
        select CPU_V7
        select ARCH_SPARSEMEM_ENABLE
+       select ARCH_HAS_HOLES_MEMORYMODEL
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
        select HAVE_S3C_RTC if RTC_CLASS
@@@ -812,6 -834,7 +834,7 @@@ config ARCH_U30
        select ARM_VIC
        select GENERIC_CLOCKEVENTS
        select CLKDEV_LOOKUP
+       select HAVE_MACH_CLKDEV
        select GENERIC_GPIO
        help
          Support for ST-Ericsson U300 series mobile platforms.
@@@ -856,6 -879,7 +879,7 @@@ config ARCH_OMA
        select HAVE_CLK
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
+       select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
        select ARCH_HAS_HOLES_MEMORYMODEL
@@@ -883,6 -907,19 +907,19 @@@ config ARCH_VT850
        select HAVE_PWM
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+ 
+ config ARCH_ZYNQ
+       bool "Xilinx Zynq ARM Cortex A9 Platform"
+       select CPU_V7
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+       select CLKDEV_LOOKUP
+       select ARM_GIC
+       select ARM_AMBA
+       select ICST
+       select USE_OF
+       help
+         Support for Xilinx Zynq ARM Cortex A9 Platform
  endchoice
  
  #
@@@ -928,8 -965,6 +965,6 @@@ source "arch/arm/mach-kirkwood/Kconfig
  
  source "arch/arm/mach-ks8695/Kconfig"
  
- source "arch/arm/mach-loki/Kconfig"
- 
  source "arch/arm/mach-lpc32xx/Kconfig"
  
  source "arch/arm/mach-msm/Kconfig"
@@@ -973,7 -1008,6 +1008,6 @@@ source "arch/arm/plat-spear/Kconfig
  source "arch/arm/plat-tcc/Kconfig"
  
  if ARCH_S3C2410
- source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"
  source "arch/arm/mach-s3c2412/Kconfig"
  source "arch/arm/mach-s3c2416/Kconfig"
@@@ -1682,7 -1716,6 +1716,7 @@@ config USE_O
        bool "Flattened Device Tree support"
        select OF
        select OF_EARLY_FLATTREE
 +      select IRQ_DOMAIN
        help
          Include support for flattened device tree machine descriptions.
  
@@@ -1896,10 -1929,6 +1930,6 @@@ config CPU_FREQ_PX
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
  
- config CPU_FREQ_S3C64XX
-       bool "CPUfreq support for Samsung S3C64XX CPUs"
-       depends on CPU_FREQ && CPU_S3C6410
- 
  config CPU_FREQ_S3C
        bool
        help

diff --combined arch/arm/Makefile
index f7135595eb70bd3cad34da993ddae50ec1e0a7ca,3a4a04b33d0f7761ca4963e28bac99ff64960238..70c424eaf7b0d84db6af6431279a835ba71094c2
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -150,7 -150,6 +150,6 @@@ machine-$(CONFIG_ARCH_IXP23XX)             := ixp2
  machine-$(CONFIG_ARCH_IXP4XX)         := ixp4xx
  machine-$(CONFIG_ARCH_KIRKWOOD)               := kirkwood
  machine-$(CONFIG_ARCH_KS8695)         := ks8695
- machine-$(CONFIG_ARCH_LOKI)           := loki
  machine-$(CONFIG_ARCH_LPC32XX)                := lpc32xx
  machine-$(CONFIG_ARCH_MMP)            := mmp
  machine-$(CONFIG_ARCH_MSM)            := msm
@@@ -169,11 -168,11 +168,11 @@@ machine-$(CONFIG_ARCH_OMAP3)            := omap
  machine-$(CONFIG_ARCH_OMAP4)          := omap2
  machine-$(CONFIG_ARCH_ORION5X)                := orion5x
  machine-$(CONFIG_ARCH_PNX4008)                := pnx4008
+ machine-$(CONFIG_ARCH_PRIMA2)         := prima2
  machine-$(CONFIG_ARCH_PXA)            := pxa
  machine-$(CONFIG_ARCH_REALVIEW)               := realview
  machine-$(CONFIG_ARCH_RPC)            := rpc
- machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443
- machine-$(CONFIG_ARCH_S3C24A0)                := s3c24a0
+ machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443
  machine-$(CONFIG_ARCH_S3C64XX)                := s3c64xx
  machine-$(CONFIG_ARCH_S5P64X0)                := s5p64x0
  machine-$(CONFIG_ARCH_S5PC100)                := s5pc100
@@@ -196,6 -195,7 +195,7 @@@ machine-$(CONFIG_MACH_SPEAR300)            := spe
  machine-$(CONFIG_MACH_SPEAR310)               := spear3xx
  machine-$(CONFIG_MACH_SPEAR320)               := spear3xx
  machine-$(CONFIG_MACH_SPEAR600)               := spear6xx
+ machine-$(CONFIG_ARCH_ZYNQ)           := zynq
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
@@@ -203,6 -203,7 +203,7 @@@ plat-$(CONFIG_ARCH_MXC)            := mx
  plat-$(CONFIG_ARCH_OMAP)      := omap
  plat-$(CONFIG_ARCH_S3C64XX)   := samsung
  plat-$(CONFIG_ARCH_TCC_926)   := tcc
+ plat-$(CONFIG_ARCH_ZYNQ)      := versatile
  plat-$(CONFIG_PLAT_IOP)               := iop
  plat-$(CONFIG_PLAT_NOMADIK)   := nomadik
  plat-$(CONFIG_PLAT_ORION)     := orion
@@@ -281,12 -282,6 +282,12 @@@ zImage Image xipImage bootpImage uImage
  zinstall uinstall install: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
  
 +%.dtb:
 +      $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 +
 +dtbs:
 +      $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 +
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
@@@ -303,7 -298,6 +304,7 @@@ define archhel
    echo  '  uImage        - U-Boot wrapped zImage'
    echo  '  bootpImage    - Combined zImage and initial RAM disk' 
    echo  '                  (supply initrd image via make variable INITRD=<path>)'
 +  echo  '  dtbs          - Build device tree blobs for enabled boards'
    echo  '  install       - Install uncompressed kernel'
    echo  '  zinstall      - Install compressed kernel'
    echo  '  uinstall      - Install U-Boot wrapped compressed kernel'