Bläddra i källkod

Merge tag 'zynmp-dt-fixes-for-4.10' of https://github.com/Xilinx/linux-xlnx into fixes

arm: Xilinx ZynqMP DT fixes for v4.10

- Fix dtc warnings
- Fix i2c compatible string

* tag 'zynmp-dt-fixes-for-4.10' of https://github.com/Xilinx/linux-xlnx:
  ARM64: zynqmp: Fix i2c node's compatible string
  ARM64: zynqmp: Fix W=1 dtc 1.4 warnings

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 8 år sedan
förälder
incheckning
9511ecab07

+ 1 - 1
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts

@@ -27,7 +27,7 @@
 		stdout-path = "serial0:115200n8";
 		stdout-path = "serial0:115200n8";
 	};
 	};
 
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x40000000>;
 		reg = <0x0 0x0 0x0 0x40000000>;
 	};
 	};

+ 3 - 3
arch/arm64/boot/dts/xilinx/zynqmp.dtsi

@@ -72,7 +72,7 @@
 			     <1 10 0xf08>;
 			     <1 10 0xf08>;
 	};
 	};
 
 
-	amba_apu {
+	amba_apu: amba_apu@0 {
 		compatible = "simple-bus";
 		compatible = "simple-bus";
 		#address-cells = <2>;
 		#address-cells = <2>;
 		#size-cells = <1>;
 		#size-cells = <1>;
@@ -175,7 +175,7 @@
 		};
 		};
 
 
 		i2c0: i2c@ff020000 {
 		i2c0: i2c@ff020000 {
-			compatible = "cdns,i2c-r1p10";
+			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
 			status = "disabled";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 17 4>;
 			interrupts = <0 17 4>;
@@ -185,7 +185,7 @@
 		};
 		};
 
 
 		i2c1: i2c@ff030000 {
 		i2c1: i2c@ff030000 {
-			compatible = "cdns,i2c-r1p10";
+			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
 			status = "disabled";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 18 4>;
 			interrupts = <0 18 4>;