* [PATCH 2/3] ARM: dts: imx27: Fix memory node duplicaton
2018-11-26 12:40 [PATCH 1/3] ARM: dts: imx1: Fix memory node duplicaton Fabio Estevam
@ 2018-11-26 12:40 ` Fabio Estevam
2018-11-26 12:40 ` [PATCH 3/3] ARM: dts: imx25: " Fabio Estevam
2018-11-26 13:13 ` [PATCH 1/3] ARM: dts: imx1: " Vladimir Zapolskiy
2 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2018-11-26 12:40 UTC (permalink / raw)
To: shawnguo; +Cc: devicetree, robh+dt, Fabio Estevam, linux-arm-kernel
Boards based on imx27 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx27.dtsi file.
Fix the duplication by removing the memory node from the dtsi file
and by adding 'device_type = "memory";' in the board dts.
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
arch/arm/boot/dts/imx27-apf27.dts | 1 +
arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 1 +
arch/arm/boot/dts/imx27-pdk.dts | 1 +
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 +
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 +
arch/arm/boot/dts/imx27.dtsi | 2 --
6 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 3eddd80..f635d5c 100644
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -20,6 +20,7 @@
compatible = "armadeus,imx27-apf27", "fsl,imx27";
memory@a0000000 {
+ device_type = "memory";
reg = <0xa0000000 0x04000000>;
};
};
diff --git a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
index 9c455dc..c85f9d0 100644
--- a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
+++ b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
@@ -17,6 +17,7 @@
compatible = "eukrea,cpuimx27", "fsl,imx27";
memory@a0000000 {
+ device_type = "memory";
reg = <0xa0000000 0x04000000>;
};
diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index f9a882d..35123b7 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -10,6 +10,7 @@
compatible = "fsl,imx27-pdk", "fsl,imx27";
memory@a0000000 {
+ device_type = "memory";
reg = <0xa0000000 0x08000000>;
};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
index cbad7c8..b0b4f7c 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
@@ -18,6 +18,7 @@
compatible = "phytec,imx27-pca100", "fsl,imx27";
memory@a0000000 {
+ device_type = "memory";
reg = <0xa0000000 0x08000000>; /* 128MB */
};
};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index ec466b4..0935e14 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -17,6 +17,7 @@
compatible = "phytec,imx27-pcm038", "fsl,imx27";
memory@a0000000 {
+ device_type = "memory";
reg = <0xa0000000 0x08000000>;
};
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 151b0eb..26ff5d4 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -16,10 +16,8 @@
* The decompressor and also some bootloaders rely on a
* pre-existing /chosen node to be available to insert the
* command line and merge other ATAGS info.
- * Also for U-Boot there must be a pre-existing /memory node.
*/
chosen {};
- memory { device_type = "memory"; };
aliases {
ethernet0 = &fec;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] ARM: dts: imx25: Fix memory node duplicaton
2018-11-26 12:40 [PATCH 1/3] ARM: dts: imx1: Fix memory node duplicaton Fabio Estevam
2018-11-26 12:40 ` [PATCH 2/3] ARM: dts: imx27: " Fabio Estevam
@ 2018-11-26 12:40 ` Fabio Estevam
2018-11-26 13:13 ` [PATCH 1/3] ARM: dts: imx1: " Vladimir Zapolskiy
2 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2018-11-26 12:40 UTC (permalink / raw)
To: shawnguo; +Cc: devicetree, robh+dt, Fabio Estevam, linux-arm-kernel
Boards based on imx25 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx25.dtsi file.
Fix the duplication by removing the memory node from the dtsi file
and by adding 'device_type = "memory";' in the board dts.
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 1 +
arch/arm/boot/dts/imx25-karo-tx25.dts | 1 +
arch/arm/boot/dts/imx25-pdk.dts | 1 +
arch/arm/boot/dts/imx25.dtsi | 2 --
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
index e316fe0..e4d7da2 100644
--- a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+++ b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
@@ -18,6 +18,7 @@
compatible = "eukrea,cpuimx25", "fsl,imx25";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x4000000>; /* 64M */
};
};
diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index 5cb6967..f37e9a7 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -37,6 +37,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
};
};
diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index a5626b4..f8544a9 100644
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -12,6 +12,7 @@
compatible = "fsl,imx25-pdk", "fsl,imx25";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x4000000>;
};
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index e801018..9a097ef 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -12,10 +12,8 @@
* The decompressor and also some bootloaders rely on a
* pre-existing /chosen node to be available to insert the
* command line and merge other ATAGS info.
- * Also for U-Boot there must be a pre-existing /memory node.
*/
chosen {};
- memory { device_type = "memory"; };
aliases {
ethernet0 = &fec;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] ARM: dts: imx1: Fix memory node duplicaton
2018-11-26 12:40 [PATCH 1/3] ARM: dts: imx1: Fix memory node duplicaton Fabio Estevam
2018-11-26 12:40 ` [PATCH 2/3] ARM: dts: imx27: " Fabio Estevam
2018-11-26 12:40 ` [PATCH 3/3] ARM: dts: imx25: " Fabio Estevam
@ 2018-11-26 13:13 ` Vladimir Zapolskiy
2018-11-28 8:53 ` Shawn Guo
2 siblings, 1 reply; 5+ messages in thread
From: Vladimir Zapolskiy @ 2018-11-26 13:13 UTC (permalink / raw)
To: Fabio Estevam, shawnguo; +Cc: devicetree, robh+dt, linux-arm-kernel
Hi Fabio,
On 11/26/2018 02:40 PM, Fabio Estevam wrote:
> Boards based on imx1 have duplicate memory nodes:
>
> - One coming from the board dts file: memory@
>
> - One coming from the imx1.dtsi file.
>
> Fix the duplication by removing the memory node from the dtsi file
> and by adding 'device_type = "memory";' in the board dts.
>
> Reported-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> arch/arm/boot/dts/imx1-ads.dts | 1 +
> arch/arm/boot/dts/imx1-apf9328.dts | 1 +
> arch/arm/boot/dts/imx1.dtsi | 2 --
> 3 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts
> index a1d81ba..3459a58 100644
> --- a/arch/arm/boot/dts/imx1-ads.dts
> +++ b/arch/arm/boot/dts/imx1-ads.dts
> @@ -21,6 +21,7 @@
> };
>
> memory@8000000 {
> + device_type = "memory";
> reg = <0x08000000 0x04000000>;
there is an unwanted space symbol before 'device_type'.
--
Best wishes,
Vladimir
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] ARM: dts: imx1: Fix memory node duplicaton
2018-11-26 13:13 ` [PATCH 1/3] ARM: dts: imx1: " Vladimir Zapolskiy
@ 2018-11-28 8:53 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2018-11-28 8:53 UTC (permalink / raw)
To: Vladimir Zapolskiy; +Cc: devicetree, robh+dt, Fabio Estevam, linux-arm-kernel
On Mon, Nov 26, 2018 at 03:13:24PM +0200, Vladimir Zapolskiy wrote:
> Hi Fabio,
>
> On 11/26/2018 02:40 PM, Fabio Estevam wrote:
> > Boards based on imx1 have duplicate memory nodes:
> >
> > - One coming from the board dts file: memory@
> >
> > - One coming from the imx1.dtsi file.
> >
> > Fix the duplication by removing the memory node from the dtsi file
> > and by adding 'device_type = "memory";' in the board dts.
> >
> > Reported-by: Rob Herring <robh@kernel.org>
> > Signed-off-by: Fabio Estevam <festevam@gmail.com>
> > ---
> > arch/arm/boot/dts/imx1-ads.dts | 1 +
> > arch/arm/boot/dts/imx1-apf9328.dts | 1 +
> > arch/arm/boot/dts/imx1.dtsi | 2 --
> > 3 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts
> > index a1d81ba..3459a58 100644
> > --- a/arch/arm/boot/dts/imx1-ads.dts
> > +++ b/arch/arm/boot/dts/imx1-ads.dts
> > @@ -21,6 +21,7 @@
> > };
> >
> > memory@8000000 {
> > + device_type = "memory";
> > reg = <0x08000000 0x04000000>;
>
> there is an unwanted space symbol before 'device_type'.
I fixed it up and applied the series.
Shawn
^ permalink raw reply [flat|nested] 5+ messages in thread