| Message ID | 20181130015251.20754-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 8ef86955fe59f7912a40d57ae4c6d511f0187b4d |
| Headers | show |
| Series | ARM: dts: aspeed: add missing memory unit-address | expand |
On Thu, Nov 29, 2018 at 07:52:51PM -0600, Rob Herring wrote: > 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> > --- > Might be better to just remove the node altogether from the SoC dtsi > file. It's only saving the device_type definition. Since I'm sweeping DT pull requests right now, and this is pretty straightforward, I've applied it to next/dt directly. -Olof
On Sat, 1 Dec 2018 at 10:27, Olof Johansson <olof@lixom.net> wrote: > > On Thu, Nov 29, 2018 at 07:52:51PM -0600, Rob Herring wrote: > > 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> > > --- > > Might be better to just remove the node altogether from the SoC dtsi > > file. It's only saving the device_type definition. > > Since I'm sweeping DT pull requests right now, and this is pretty > straightforward, I've applied it to next/dt directly. Thanks Rob and Olof. Cheers, Joel
diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts index df1227613d48..c2ece0b91885 100644 --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts @@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x40000000>; }; 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>; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts index d598b6391362..024e52a6cd0f 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts @@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -322,4 +322,3 @@ &adc { status = "okay"; }; - diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts index 43ed13963d35..33d704541de6 100644 --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +++ b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts @@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x20000000>; };
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> --- Might be better to just remove the node altogether from the SoC dtsi file. It's only saving the device_type definition. arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.19.1