[meta-xilinx] [PATCH 4/4] zybo-linux-bd-zynq7: Update the device-tree for linux-xlnx v4.6

[Nathan Rossi]

Update the bindings where required for the v4.6 linux-xlnx kernel. These
changes are incompatible with older linux-xlnx kernels due to changes in
the Xilinx DRM bindings.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi       |  2 ++
 .../files/zybo-linux-bd/zybo-linux-bd-zynq7.dts           | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi b/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi
index 0e358e5aec..32bc768859 100644
--- a/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi
+++ b/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi
@@ -106,6 +106,8 @@
 		axi_vdma_0: dma at 43000000 {
 			#dma-cells = <1>;
 			compatible = "xlnx,axi-vdma-1.00.a";
+			clocks = <&clkc 15>;
+			clock-names = "s_axi_lite_aclk";
 			interrupt-parent = <&intc>;
 			interrupts = <0 30 4>;
 			reg = <0x43000000 0x10000>;
diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts b/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts
index b31666fce7..79deba49f2 100644
--- a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts
+++ b/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts
@@ -13,7 +13,8 @@
 		spi0 = &qspi;
 	};
 	chosen {
-		bootargs = "console=ttyPS0,115200 earlyprintk";
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
 	};
 	memory {
 		device_type = "memory";
@@ -68,7 +69,7 @@
 			xlnx,pixel-format = "xrgb8888";
 			plane0 {
 				dmas = <&axi_vdma_0 0>;
-				dma-names = "dma";
+				dma-names = "dma0";
 			};
 		};
 	};
@@ -126,12 +127,10 @@
 	phy-handle = <&phy0>;
 	phy-mode = "rgmii-id";
 	local-mac-address = [];
-	gem0_mdio: mdio {
-		phy0: phy at 1 {
-			compatible = "realtek,RTL8211E";
-			device_type = "ethernet-phy";
-			reg = <1>;
-		};
+	phy0: phy at 1 {
+		compatible = "realtek,rtl8211e";
+		device_type = "ethernet-phy";
+		reg = <1>;
 	};
 };
 
-- 
2.10.2