* [PATCH 2/3] ARM: dts: imx35: Fix memory node duplicaton
2018-11-06 15:40 [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton Fabio Estevam
@ 2018-11-06 15:40 ` Fabio Estevam
2018-11-06 15:40 ` [PATCH 3/3] ARM: dts: imx7: " Fabio Estevam
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2018-11-06 15:40 UTC (permalink / raw)
To: shawnguo
Cc: robh, devicetree, linux-imx, kernel, Fabio Estevam,
linux-arm-kernel
Boards based on imx35 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx35.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/imx35-eukrea-cpuimx35.dtsi | 1 +
arch/arm/boot/dts/imx35-pdk.dts | 1 +
arch/arm/boot/dts/imx35.dtsi | 2 --
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi b/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
index ba39d93..5f8a47a 100644
--- a/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
+++ b/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
@@ -18,6 +18,7 @@
compatible = "eukrea,cpuimx35", "fsl,imx35";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128M */
};
};
diff --git a/arch/arm/boot/dts/imx35-pdk.dts b/arch/arm/boot/dts/imx35-pdk.dts
index df613e8..ddce0a8 100644
--- a/arch/arm/boot/dts/imx35-pdk.dts
+++ b/arch/arm/boot/dts/imx35-pdk.dts
@@ -11,6 +11,7 @@
compatible = "fsl,imx35-pdk", "fsl,imx35";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x8000000>,
<0x90000000 0x8000000>;
};
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index a1c3d28..59cadee 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -13,10 +13,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: imx7: Fix memory node duplicaton
2018-11-06 15:40 [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton Fabio Estevam
2018-11-06 15:40 ` [PATCH 2/3] ARM: dts: imx35: " Fabio Estevam
@ 2018-11-06 15:40 ` Fabio Estevam
2018-11-08 10:34 ` [PATCH 1/3] ARM: dts: imx31: " Vladimir Zapolskiy
2018-11-16 14:39 ` Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2018-11-06 15:40 UTC (permalink / raw)
To: shawnguo
Cc: robh, devicetree, linux-imx, kernel, Fabio Estevam,
linux-arm-kernel
Boards based on imx7 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx7s.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/imx7d-cl-som-imx7.dts | 3 ++-
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 +
arch/arm/boot/dts/imx7d-colibri.dtsi | 1 +
arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 +
arch/arm/boot/dts/imx7d-pico.dtsi | 1 +
arch/arm/boot/dts/imx7d-sdb.dts | 1 +
arch/arm/boot/dts/imx7s-colibri.dtsi | 1 +
arch/arm/boot/dts/imx7s-warp.dts | 1 +
arch/arm/boot/dts/imx7s.dtsi | 2 --
9 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
index 8bf365d..e615674 100644
--- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
+++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
@@ -19,6 +19,7 @@
compatible = "compulab,cl-som-imx7", "fsl,imx7d";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */
};
@@ -284,4 +285,4 @@
MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */
>;
};
-};
\ No newline at end of file
+};
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 04d24ee..898f4b8 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -8,6 +8,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index d9f8fb6..e2e327f 100644
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -45,6 +45,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index d8aac4a..4fb7e84 100644
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -12,6 +12,7 @@
compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
index 21973eb..4846df0 100644
--- a/arch/arm/boot/dts/imx7d-pico.dtsi
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -49,6 +49,7 @@
compatible = "technexion,imx7d-pico", "fsl,imx7d";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x80000000>;
};
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index f1bafda..b1b613b 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -15,6 +15,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x80000000>;
};
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index fe8344c..1fb1ec5 100644
--- a/arch/arm/boot/dts/imx7s-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -45,6 +45,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index f7ba2c0..23431fa 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -14,6 +14,7 @@
compatible = "warp,imx7s-warp", "fsl,imx7s";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index aa8df7d..477901c 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -17,10 +17,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 {
gpio0 = &gpio1;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton
2018-11-06 15:40 [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton Fabio Estevam
2018-11-06 15:40 ` [PATCH 2/3] ARM: dts: imx35: " Fabio Estevam
2018-11-06 15:40 ` [PATCH 3/3] ARM: dts: imx7: " Fabio Estevam
@ 2018-11-08 10:34 ` Vladimir Zapolskiy
2018-11-16 14:39 ` Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Vladimir Zapolskiy @ 2018-11-08 10:34 UTC (permalink / raw)
To: Fabio Estevam, shawnguo
Cc: linux-arm-kernel, robh, linux-imx, kernel, devicetree
Hi Fabio,
On 11/06/2018 05:40 PM, Fabio Estevam wrote:
> Boards based on imx31 have duplicate memory nodes:
>
> - One coming from the board dts file: memory@
>
> - One coming from the imx31.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>
thank you for the change, I've successfully tested it on my i.MX31 Lite board.
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Tested-by: Vladimir Zapolskiy <vz@mleia.com>
--
Best wishes,
Vladimir
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton
2018-11-06 15:40 [PATCH 1/3] ARM: dts: imx31: Fix memory node duplicaton Fabio Estevam
` (2 preceding siblings ...)
2018-11-08 10:34 ` [PATCH 1/3] ARM: dts: imx31: " Vladimir Zapolskiy
@ 2018-11-16 14:39 ` Shawn Guo
3 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2018-11-16 14:39 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux-arm-kernel, robh, linux-imx, kernel, devicetree
On Tue, Nov 06, 2018 at 01:40:45PM -0200, Fabio Estevam wrote:
> Boards based on imx31 have duplicate memory nodes:
>
> - One coming from the board dts file: memory@
>
> - One coming from the imx31.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>
Applied all, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread