Commit ba13357e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-4.10-2' of git://git.infradead.org/linux-mvebu into next/dt64 

Pull "mvebu dt64 for 4.10 (part 2)" from Gregory CLEMENT:

Fix DTC warning on Armada 37xx and 7K/8K

* tag 'mvebu-dt64-4.10-2' of git://git.infradead.org/linux-mvebu:
  ARM64: dts: marvell: Fixup memory DT warning for Armada 37xx
  arm64: dts: marvell: Fixup config-space DT warning For Armada 7K/8K
  arm64: dts: marvell: Fixup internal-regs DT warning for Armada 37xx
parents afafe375 36845345

arch/arm64/boot/dts/marvell/armada-3720-db.dts

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

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

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

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ soc { 
		#size-cells = <2>;

		ranges;



		internal-regs {

		internal-regs@d0000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ ap806 { 
		interrupt-parent = <&gic>;

		ranges;



		config-space {

		config-space@f0000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ cp110-master { 
		interrupt-parent = <&gic>;

		ranges;



		config-space {

		config-space@f2000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";