Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Rob Herring <robh@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Rob Herring and committed by
Olof Johansson
8ef86955 7f4b001b

+4 -5
+1 -1
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
··· 13 13 bootargs = "console=ttyS4,115200 earlyprintk"; 14 14 }; 15 15 16 - memory { 16 + memory@80000000 { 17 17 reg = <0x80000000 0x40000000>; 18 18 }; 19 19
+1 -1
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
··· 13 13 bootargs = "earlyprintk"; 14 14 }; 15 15 16 - memory { 16 + memory@80000000 { 17 17 reg = <0x80000000 0x20000000>; 18 18 }; 19 19
+1 -2
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
··· 14 14 bootargs = "console=ttyS4,115200 earlyprintk"; 15 15 }; 16 16 17 - memory { 17 + memory@80000000 { 18 18 reg = <0x80000000 0x40000000>; 19 19 }; 20 20 ··· 322 322 &adc { 323 323 status = "okay"; 324 324 }; 325 -
+1 -1
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
··· 17 17 bootargs = "console=ttyS4,115200 earlyprintk"; 18 18 }; 19 19 20 - memory { 20 + memory@80000000 { 21 21 reg = <0x80000000 0x20000000>; 22 22 }; 23 23