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

Merge tag 'berlin64-dt-for-v4.10-1' of... 

Merge tag 'berlin64-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt64

Pull "Berlin64 DT changes for v4.10" from Jisheng Zhang:

- fix some dtc compiler warnings

* tag 'berlin64-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  arm64: dts: berlin4ct-dmp: add missing unit name to /memory node
  arm64: dts: berlin4ct-stb: add missing unit name to /memory node
  arm64: dts: berlin4ct: add missing unit name to /soc node
parents 18e31f0b 40fdc6b0

arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts

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

	};



	memory {

	memory@1000000 {

		device_type = "memory";

		/* the first 16MB is for firmwares' usage */

		reg = <0 0x01000000 0 0x7f000000>;

arch/arm64/boot/dts/marvell/berlin4ct-stb.dts

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

	};



	memory {

	memory@1000000 {

		device_type = "memory";

		/* the first 16MB is for firmwares' usage */

		reg = <0 0x01000000 0 0x7f000000>;

arch/arm64/boot/dts/marvell/berlin4ct.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ timer { 
			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

	};



	soc {

	soc@f7000000 {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;