]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: zynqmp: Use zynqmp specific compatible string for macb
authorMichal Simek <michal.simek@xilinx.com>
Wed, 17 Jan 2018 14:57:18 +0000 (15:57 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 23 Feb 2018 14:52:48 +0000 (15:52 +0100)
The patch
"devicetree: Add compatible string for Zynq Ultrascale+ MPSoC"
(commit <988d6f07fc0a29e392035ba56e3bcfaf7b397d95>)
introduced specific compatible string for ZynqMP which should be used
first.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm64/boot/dts/xilinx/zynqmp.dtsi

index 7665fbddff280fcb4be412470e551d9409d1575e..0da98007753b6efe98afe589d21edb13c59cbe75 100644 (file)
@@ -355,7 +355,7 @@ lpd_dma_chan8: dma@ffaf0000 {
                };
 
                gem0: ethernet@ff0b0000 {
-                       compatible = "cdns,gem";
+                       compatible = "cdns,zynqmp-gem", "cdns,gem";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 57 4>, <0 57 4>;
@@ -366,7 +366,7 @@ gem0: ethernet@ff0b0000 {
                };
 
                gem1: ethernet@ff0c0000 {
-                       compatible = "cdns,gem";
+                       compatible = "cdns,zynqmp-gem", "cdns,gem";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 59 4>, <0 59 4>;
@@ -377,7 +377,7 @@ gem1: ethernet@ff0c0000 {
                };
 
                gem2: ethernet@ff0d0000 {
-                       compatible = "cdns,gem";
+                       compatible = "cdns,zynqmp-gem", "cdns,gem";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 61 4>, <0 61 4>;
@@ -388,7 +388,7 @@ gem2: ethernet@ff0d0000 {
                };
 
                gem3: ethernet@ff0e0000 {
-                       compatible = "cdns,gem";
+                       compatible = "cdns,zynqmp-gem", "cdns,gem";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 63 4>, <0 63 4>;