aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-11-13 23:14:47 +1000
committerNathan Rossi <nathan@nathanrossi.com>2016-11-19 21:36:36 +1000
commit4de832d4d608284951554a7fde28d145942f4b71 (patch)
tree97e9866dcd9a4815f102cdcb6f0273519dab3ef0
parent53d74fcac046c0b324c5005ceca491c8057f69ab (diff)
downloadmeta-xilinx-4de832d4d608284951554a7fde28d145942f4b71.tar.gz
meta-xilinx-4de832d4d608284951554a7fde28d145942f4b71.tar.bz2
meta-xilinx-4de832d4d608284951554a7fde28d145942f4b71.zip
zybo-linux-bd-zynq7: Update the device-tree for linux-xlnx v4.6
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@nathanrossi.com>
-rw-r--r--recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi2
-rw-r--r--recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts15
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 0e358e5a..32bc7688 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@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 b31666fc..79deba49 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@1 {
- compatible = "realtek,RTL8211E";
- device_type = "ethernet-phy";
- reg = <1>;
- };
+ phy0: phy@1 {
+ compatible = "realtek,rtl8211e";
+ device_type = "ethernet-phy";
+ reg = <1>;
};
};