Commit 8ef86955 authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson
Browse files

ARM: dts: aspeed: add missing memory unit-address



The base aspeed-g5.dtsi already defines a '/memory@80000000' node, so
'/memory' in the board files create a duplicate node. We're probably
getting lucky that the bootloader fixes up the memory node that the
kernel ends up using. Add the unit-address so it's merged with the base
node.

Found with DT json-schema checks.

Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-aspeed@lists.ozlabs.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 7f4b001b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
		bootargs = "console=ttyS4,115200 earlyprintk";
	};

	memory {
	memory@80000000 {
		reg = <0x80000000 0x40000000>;
	};

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
		bootargs = "earlyprintk";
	};

	memory {
	memory@80000000 {
		reg = <0x80000000 0x20000000>;
	};

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
		bootargs = "console=ttyS4,115200 earlyprintk";
	};

	memory {
	memory@80000000 {
		reg = <0x80000000 0x40000000>;
	};

@@ -322,4 +322,3 @@
&adc {
	status = "okay";
};
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
		bootargs = "console=ttyS4,115200 earlyprintk";
	};

	memory {
	memory@80000000 {
		reg = <0x80000000 0x20000000>;
	};