From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 19 Jun 2013 23:43:19 +0000 (+0200)
Subject: Merge tag 'zynq-dt-for-3.11' of git://git.xilinx.com/linux-xlnx into next/dt
X-Git-Tag: pm+acpi-3.11-rc1-more~53^2~12
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a44bde66bec168889c95bd1d0d15834b02387901;p=uclinux-h8%2Flinux.git

Merge tag 'zynq-dt-for-3.11' of git://git.xilinx.com/linux-xlnx into next/dt

From Michal Simek:

arm: Xilinx Zynq dt changes for v3.11

The branch contains:
- DT uart handling cleanup
- Support for zc706 and zed board
- Removal of board compatible string

* tag 'zynq-dt-for-3.11' of git://git.xilinx.com/linux-xlnx:
  arm: dt: zynq: Add support for the zed platform
  arm: dt: zynq: Add support for the zc706 platform
  arm: dt: zynq: Use 'status' property for UART nodes
  arm: zynq: Remove board specific compatibility string
  clk: zynq: Remove deprecated clock code
  arm: zynq: Migrate platform to clock controller
  clk: zynq: Add clock controller driver
  clk: zynq: Factor out PLL driver

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

a44bde66bec168889c95bd1d0d15834b02387901
diff --cc arch/arm/boot/dts/Makefile
index 4823c3121ee2,d34af4c8b779..4c904a8e458a
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -214,9 -205,10 +214,11 @@@ dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dt
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
  	wm8505-ref.dtb \
  	wm8650-mid.dtb \
 +	wm8750-apc8750.dtb \
  	wm8850-w70v2.dtb
- dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
+ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
+ 	zynq-zc706.dtb \
+ 	zynq-zed.dtb
  
  targets += dtbs
  targets += $(dtb-y)