* [PATCH] ARM: dts: aspeed: add missing memory unit-address
@ 2018-11-30 1:52 ` Rob Herring
0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2018-11-30 1:52 UTC (permalink / raw)
To: arm, Joel Stanley, Andrew Jeffery
Cc: devicetree, linux-aspeed, linux-arm-kernel
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(-)
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>;
};
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: aspeed: add missing memory unit-address
@ 2018-11-30 1:52 ` Rob Herring
0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2018-11-30 1:52 UTC (permalink / raw)
To: arm, Joel Stanley, Andrew Jeffery
Cc: devicetree, linux-aspeed, linux-arm-kernel
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(-)
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>;
};
--
2.19.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: aspeed: add missing memory unit-address
2018-11-30 1:52 ` Rob Herring
@ 2018-11-30 23:20 ` Olof Johansson
-1 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2018-11-30 23:20 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, linux-aspeed, Andrew Jeffery, arm, Joel Stanley,
linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: aspeed: add missing memory unit-address
@ 2018-11-30 23:20 ` Olof Johansson
0 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2018-11-30 23:20 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, linux-aspeed, Andrew Jeffery, arm, Joel Stanley,
linux-arm-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: aspeed: add missing memory unit-address
2018-11-30 23:20 ` Olof Johansson
@ 2018-12-02 22:35 ` Joel Stanley
-1 siblings, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2018-12-02 22:35 UTC (permalink / raw)
To: Olof Johansson
Cc: Rob Herring, linux-aspeed, devicetree, Andrew Jeffery, arm, Linux ARM
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: aspeed: add missing memory unit-address
@ 2018-12-02 22:35 ` Joel Stanley
0 siblings, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2018-12-02 22:35 UTC (permalink / raw)
To: Olof Johansson
Cc: Rob Herring, linux-aspeed, devicetree, Andrew Jeffery, arm, Linux ARM
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-12-02 22:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-30 1:52 [PATCH] ARM: dts: aspeed: add missing memory unit-address Rob Herring
2018-11-30 1:52 ` Rob Herring
2018-11-30 23:20 ` Olof Johansson
2018-11-30 23:20 ` Olof Johansson
2018-12-02 22:35 ` Joel Stanley
2018-12-02 22:35 ` Joel Stanley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.