Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9511ecab authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 1b9ec812 c415f9e8

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;

	};

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
			     <1 10 0xf08>;

	};



	amba_apu {

	amba_apu: amba_apu@0 {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;
@@ -175,7 +175,7 @@ 
		};



		i2c0: i2c@ff020000 {

			compatible = "cdns,i2c-r1p10";

			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 17 4>;
@@ -185,7 +185,7 @@ 
		};



		i2c1: i2c@ff030000 {

			compatible = "cdns,i2c-r1p10";

			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 18 4>;