summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-11-30 02:52:51 +0100
committerOlof Johansson <olof@lixom.net>2018-12-01 00:20:42 +0100
commit8ef86955fe59f7912a40d57ae4c6d511f0187b4d (patch)
tree50470ccc454a61d8f2b114e39910ed65ad600115 /arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
parentARM: dts: realview-pbx: Fix duplicate regulator nodes (diff)
downloadlinux-8ef86955fe59f7912a40d57ae4c6d511f0187b4d.tar.xz
linux-8ef86955fe59f7912a40d57ae4c6d511f0187b4d.zip
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>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts')
-rw-r--r--arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
index 7a291de02543..22dade6393d0 100644
--- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
@@ -13,7 +13,7 @@
bootargs = "earlyprintk";
};
- memory {
+ memory@80000000 {
reg = <0x80000000 0x20000000>;
};