Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt

From Michal Simek <michal.simek@xilinx.com>:

These are based on previous patches (arm-soc zynq/cleanup branch).
The branch is still based on rc3 but I have also tried to merged it
with the v3.7-rc5 and there is no issue.

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: add clk binding support to the ttc
  ARM: zynq: use zynq clk bindings
  clk: Add support for fundamental zynq clks
  ARM: zynq: dts: split up device tree
  ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
  ARM: zynq: dts: add description of the second uart
  ARM: zynq: move arm-specific sys_timer out of ttc
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/Kconfig
index d33dc606f7ece1bb03ca7e77387fbd4848f6013b,ccfe0ab8c87702076afaf621963c730e1d34be3f..23252783e93f37bbdd78bb7bf3fa92a10b027ccd
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -433,6 -433,19 +433,6 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
 -config ARCH_MXC
 -      bool "Freescale MXC/iMX-based"
 -      select ARCH_REQUIRE_GPIOLIB
 -      select CLKDEV_LOOKUP
 -      select CLKSRC_MMIO
 -      select GENERIC_CLOCKEVENTS
 -      select GENERIC_IRQ_CHIP
 -      select MULTI_IRQ_HANDLER
 -      select SPARSE_IRQ
 -      select USE_OF
 -      help
 -        Support for Freescale MXC/iMX-based family of processors
 -
  config ARCH_MXS
        bool "Freescale MXS-based"
        select ARCH_REQUIRE_GPIOLIB
@@@ -924,6 -937,7 +924,6 @@@ config ARCH_OMA
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
 -      select NEED_MACH_GPIO_H
        help
          Support for TI's OMAP platform (OMAP1/2/3/4).
  
@@@ -945,7 -959,7 +945,7 @@@ config ARCH_ZYN
        bool "Xilinx Zynq ARM Cortex A9 Platform"
        select ARM_AMBA
        select ARM_GIC
-       select CLKDEV_LOOKUP
+       select COMMON_CLK
        select CPU_V7
        select GENERIC_CLOCKEVENTS
        select ICST
@@@ -1044,7 -1058,7 +1044,7 @@@ source "arch/arm/mach-msm/Kconfig
  
  source "arch/arm/mach-mv78xx0/Kconfig"
  
 -source "arch/arm/plat-mxc/Kconfig"
 +source "arch/arm/mach-imx/Kconfig"
  
  source "arch/arm/mach-mxs/Kconfig"
  

diff --combined arch/arm/Kconfig.debug
index 5566520686a5a8bcad7d66f9b6bb0e56b494b6e0,7754d51f2b19fc3f3be91355771de8b4569a7cef..5bbfcf0d35e0b59f868b8811c693e326590bc96d
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -132,6 -132,23 +132,23 @@@ choic
                  their output to UART1 serial port on DaVinci TNETV107X
                  devices.
  
+       config DEBUG_ZYNQ_UART0
+               bool "Kernel low-level debugging on Xilinx Zynq using UART0"
+               depends on ARCH_ZYNQ
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to UART0 on the Zynq platform.
+ 
+       config DEBUG_ZYNQ_UART1
+               bool "Kernel low-level debugging on Xilinx Zynq using UART1"
+               depends on ARCH_ZYNQ
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to UART1 on the Zynq platform.
+ 
+                 If you have a ZC702 board and want early boot messages to
+                 appear on the USB serial adaptor, select this option.
+ 
        config DEBUG_DC21285_PORT
                bool "Kernel low-level debugging messages via footbridge serial port"
                depends on FOOTBRIDGE
@@@ -412,14 -429,6 +429,14 @@@ endchoic
  config DEBUG_LL_INCLUDE
        string
        default "debug/icedcc.S" if DEBUG_ICEDCC
 +      default "debug/imx.S" if DEBUG_IMX1_UART || \
 +                               DEBUG_IMX25_UART || \
 +                               DEBUG_IMX21_IMX27_UART || \
 +                               DEBUG_IMX31_IMX35_UART || \
 +                               DEBUG_IMX51_UART || \
 +                               DEBUG_IMX50_IMX53_UART ||\
 +                               DEBUG_IMX6Q_UART2 || \
 +                               DEBUG_IMX6Q_UART4
        default "debug/highbank.S" if DEBUG_HIGHBANK_UART
        default "debug/mvebu.S" if DEBUG_MVEBU_UART
        default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

diff --combined arch/arm/Makefile
index 3353b761320854fd1720bf50648ebc9684398627,554cfac414295fc15f3d3d2f9737a906b4ba1212..97252d86a7014d47ff00cb896d594e0364d68132
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -196,9 -196,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)                += zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -plat-$(CONFIG_ARCH_MXC)               += mxc
  plat-$(CONFIG_ARCH_OMAP)      += omap
  plat-$(CONFIG_ARCH_S3C64XX)   += samsung
- plat-$(CONFIG_ARCH_ZYNQ)      += versatile
  plat-$(CONFIG_PLAT_IOP)               += iop
  plat-$(CONFIG_PLAT_NOMADIK)   += nomadik
  plat-$(CONFIG_PLAT_ORION)     += orion

diff --combined arch/arm/boot/dts/Makefile
index 2458b69e2be6f2937d1189f8251a83592a4d8ec8,76ed11e68f72e379d4469db470bcb8bdc722a5f0..23b178389eb797185d79300def7e435d9f904e51
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -63,17 -63,15 +63,17 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-m28evk.dtb \
        imx28-tx28.dtb
  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 +      omap3-beagle.dtb \
        omap3-beagle-xm.dtb \
        omap3-evm.dtb \
        omap3-tobi.dtb \
        omap4-panda.dtb \
 -      omap4-pandaES.dtb \
 -      omap4-var_som.dtb \
 +      omap4-panda-es.dtb \
 +      omap4-var-som.dtb \
        omap4-sdp.dtb \
        omap5-evm.dtb \
        am335x-evm.dtb \
 +      am335x-evmsk.dtb \
        am335x-bone.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
@@@ -105,5 -103,6 +105,6 @@@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb
+ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
  
  endif