boards/common/zynq-7-mainline-gem.dtsi: Added include

* This include is for setting up the zynq-7-base.dtsi to be compatible
  with linux-yocto and mainline drivers.

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

2 files changed, 33 insertions, 1 deletions

diff --git a/conf/machine/boards/common/zynq-7-mainline-gem.dtsi b/conf/machine/boards/common/zynq-7-mainline-gem.dtsi
new file mode 100644
index 00000000..e3a331c5
--- /dev/null
+++ b/conf/machine/boards/common/zynq-7-mainline-gem.dtsi
@@ -0,0 +1,29 @@
+/*
+ * Zynq 7 Device Tree - Linux Mainline GEM
+ * 
+ * This dtsi file will configure the ps7_ethernet_* nodes to be compatible with
+ * the upstream Cadence GEM driver (macb).
+ *
+ * To use this dtsi, include it after the base include. e.g.
+ *     ...
+ *     /include/ "zynq-7-base.dtsi"
+ *     /include/ "zynq-7-mainline-gem.dtsi"
+ *     / {
+ *     ...
+ */
+/ {
+        ps7_axi_interconnect_0: amba@0 {
+                ps7_ethernet_0: ps7-ethernet@e000b000 {
+                        clock-names = "pclk", "hclk", "tx_clk";
+                        clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>;
+                        compatible = "cdns,gem";
+                        reg = <0xe000b000 0x4000>;
+                } ;
+                ps7_ethernet_1: ps7-ethernet@e000c000 {
+                        clock-names = "pclk", "hclk", "tx_clk";
+                        clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>;
+                        compatible = "cdns,gem";
+                        reg = <0xe000c000 0x4000>;
+                } ;
+        } ;
+} ;
diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc
index 8e31a0b9..2b76cdee 100644
--- a/recipes-kernel/linux/linux-machine-common.inc
+++ b/recipes-kernel/linux/linux-machine-common.inc
@@ -5,4 +5,7 @@ require linux-machine-config.inc
 DEPENDS_append_microblaze += "u-boot-mkimage-native"
 
 # Common Device Tree Includes
-MACHINE_DEVICETREE_append_zynq += "common/zynq-7-base.dtsi"
+MACHINE_DEVICETREE_append_zynq += " \
+                common/zynq-7-base.dtsi \
+                common/zynq-7-mainline-gem.dtsi \
+                "