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

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
...@@ -13,7 +13,7 @@ chosen { ...@@ -13,7 +13,7 @@ chosen {
bootargs = "console=ttyS4,115200 earlyprintk"; bootargs = "console=ttyS4,115200 earlyprintk";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
......
...@@ -13,7 +13,7 @@ chosen { ...@@ -13,7 +13,7 @@ chosen {
bootargs = "earlyprintk"; bootargs = "earlyprintk";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x20000000>; reg = <0x80000000 0x20000000>;
}; };
......
...@@ -14,7 +14,7 @@ chosen { ...@@ -14,7 +14,7 @@ chosen {
bootargs = "console=ttyS4,115200 earlyprintk"; bootargs = "console=ttyS4,115200 earlyprintk";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
...@@ -322,4 +322,3 @@ &ibt { ...@@ -322,4 +322,3 @@ &ibt {
&adc { &adc {
status = "okay"; status = "okay";
}; };
...@@ -17,7 +17,7 @@ chosen { ...@@ -17,7 +17,7 @@ chosen {
bootargs = "console=ttyS4,115200 earlyprintk"; bootargs = "console=ttyS4,115200 earlyprintk";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x20000000>; reg = <0x80000000 0x20000000>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment