* [PATCH AUTOSEL 4.19 009/219] ARM: dts: imx53: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 010/219] ARM: dts: imx31: " Sasha Levin
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit e8fd17b900a4a1e3a8bef7b44727cbad35db05a7 ]
Boards based on imx53 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx53.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx53-ard.dts | 1 +
arch/arm/boot/dts/imx53-cx9020.dts | 1 +
arch/arm/boot/dts/imx53-m53.dtsi | 1 +
arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 +
arch/arm/boot/dts/imx53-smd.dts | 1 +
arch/arm/boot/dts/imx53-tqma53.dtsi | 1 +
arch/arm/boot/dts/imx53-tx53.dtsi | 1 +
arch/arm/boot/dts/imx53-usbarmory.dts | 1 +
arch/arm/boot/dts/imx53.dtsi | 2 --
9 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 117bd002dd1d1..7d5a48250f867 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -19,6 +19,7 @@
compatible = "fsl,imx53-ard", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
index cf70ebc4399a2..c875e23ee45fb 100644
--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@@ -22,6 +22,7 @@
};
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
index ce45f08e30514..db2e5bce9b6a1 100644
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -16,6 +16,7 @@
compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 50dde84b72ed7..f00dda334976a 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -11,6 +11,7 @@
};
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 462071c9ddd73..09071ca11c6cf 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -12,6 +12,7 @@
compatible = "fsl,imx53-smd", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
index a72b8981fc3bd..c77d58f06c949 100644
--- a/arch/arm/boot/dts/imx53-tqma53.dtsi
+++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
@@ -17,6 +17,7 @@
compatible = "tq,tqma53", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>; /* Up to 1GiB */
};
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 54cf3e67069a9..4ab135906949f 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -51,6 +51,7 @@
/* Will be filled by the bootloader */
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0>;
};
diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
index f6268d0ded296..ee6263d1c2d3d 100644
--- a/arch/arm/boot/dts/imx53-usbarmory.dts
+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
@@ -58,6 +58,7 @@
};
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index b6b0818343c4e..8accbe16b7584 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -23,10 +23,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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 010/219] ARM: dts: imx31: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 009/219] ARM: dts: imx53: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 011/219] ARM: dts: imx35: " Sasha Levin
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Vladimir Zapolskiy, Shawn Guo,
Sasha Levin, devicetree, linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 013d37e4707e24c7b9bc3fc55aeda55ce9c2b262 ]
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>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Tested-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx31-bug.dts | 1 +
arch/arm/boot/dts/imx31-lite.dts | 1 +
arch/arm/boot/dts/imx31.dtsi | 2 --
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx31-bug.dts b/arch/arm/boot/dts/imx31-bug.dts
index 6ee4ff8e4e8f0..9eb960cc02cc5 100644
--- a/arch/arm/boot/dts/imx31-bug.dts
+++ b/arch/arm/boot/dts/imx31-bug.dts
@@ -17,6 +17,7 @@
compatible = "buglabs,imx31-bug", "fsl,imx31";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128M */
};
};
diff --git a/arch/arm/boot/dts/imx31-lite.dts b/arch/arm/boot/dts/imx31-lite.dts
index db52ddccabc33..d17abdfb6330c 100644
--- a/arch/arm/boot/dts/imx31-lite.dts
+++ b/arch/arm/boot/dts/imx31-lite.dts
@@ -18,6 +18,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x8000000>;
};
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index ca1419ca303c3..2fc64d2c7c88e 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -10,10 +10,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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 011/219] ARM: dts: imx35: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 009/219] ARM: dts: imx53: " Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 010/219] ARM: dts: imx31: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 012/219] ARM: dts: imx7: " Sasha Levin
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 8721610a6c2b8c42fc57819d8c3bfbb9166f95a3 ]
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 ba39d938f2891..5f8a47a9fcd40 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 df613e88fd2c1..ddce0a844758b 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 1c50b785cad47..b36b97b655dda 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 012/219] ARM: dts: imx7: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (2 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 011/219] ARM: dts: imx35: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 013/219] ARM: dts: imx6ul: " Sasha Levin
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 29988e867cb17de7119e971f9acfad2c3fccdb47 ]
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 584418f517a88..62d5e9a4a7818 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 04d24ee17b142..898f4b8d7421f 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 d9f8fb69511b6..e2e327f437e35 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 177d21fdeb288..6b4acea1ef795 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 f27b3849d3ff3..934a019f341e4 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 c9b3c60b0eb22..317f1bcc56e2a 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 fe8344cee8641..1fb1ec5d3d707 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 fa390da636de7..97d5c711eb0ca 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -51,6 +51,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 90f5bdfa9b3ce..7eaf96b425bed 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 013/219] ARM: dts: imx6ul: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (3 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 012/219] ARM: dts: imx7: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 014/219] ARM: dts: imx6sx: " Sasha Levin
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 750d8df6e7b269b828f66631a1d39ea027afc92a ]
Boards based on imx6ul have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6ul.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 +
arch/arm/boot/dts/imx6ul-geam.dts | 1 +
arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 +
arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 +
arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 +
arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 1 +
arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 +
arch/arm/boot/dts/imx6ul.dtsi | 2 --
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 +
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 +
10 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
index 32a07232c0345..8180211265592 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
@@ -12,6 +12,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index d81d20f8fc8dd..85cfad080f15c 100644
--- a/arch/arm/boot/dts/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -51,6 +51,7 @@
compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x08000000>;
};
diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index cd99285511544..1cb52744f58ad 100644
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -46,6 +46,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi
index 8f775f6974d1c..8d6893210842b 100644
--- a/arch/arm/boot/dts/imx6ul-litesom.dtsi
+++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi
@@ -48,6 +48,7 @@
compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
index a031bee311df4..cf7faf4b9c47e 100644
--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -49,6 +49,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};
diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 0c09420f99512..797262d2f27fd 100644
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -53,6 +53,7 @@
/* Will be filled by the bootloader */
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0>;
};
diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 02b5ba42cd591..bb6dbfd5546b4 100644
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -71,6 +71,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 336cdead3da54..50834a43e5fb2 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -15,10 +15,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 = &fec1;
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index 10ab4697950f5..fb213bec46543 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -7,6 +7,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 183193e8580dd..038d8c90f6dfe 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -7,6 +7,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 014/219] ARM: dts: imx6sx: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (4 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 013/219] ARM: dts: imx6ul: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 015/219] ARM: dts: imx6sl: " Sasha Levin
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 216f35fedd8688c8b654ebfbad18c6e64713fad7 ]
Boards based on imx6sx have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sx.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 +
arch/arm/boot/dts/imx6sx-sabreauto.dts | 1 +
arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 +
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 +
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 +
arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 +
arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 +
arch/arm/boot/dts/imx6sx.dtsi | 2 --
8 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index adb5cc7d8ce2f..832b5c5d7441a 100644
--- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@ -12,6 +12,7 @@
compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 841a27f3198ff..48aede543612b 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -11,6 +11,7 @@
compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x80000000>;
};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index f8f31872fa144..7f5ede5ca4c30 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -21,6 +21,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
index 252175b592475..2bc51623a8060 100644
--- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
@@ -21,6 +21,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
index 40ccdf43dffc5..db0feb9b9f5d7 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
@@ -49,6 +49,7 @@
compatible = "udoo,neobasic", "fsl,imx6sx";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
index 42bfc8f8f7f6b..5c7a2bb9141cb 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
@@ -49,6 +49,7 @@
compatible = "udoo,neoextended", "fsl,imx6sx";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
index c84c877f09d49..13dfe2afaba56 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
@@ -49,6 +49,7 @@
compatible = "udoo,neofull", "fsl,imx6sx";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 7b62e6fb47ebe..ae0728df542e9 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -15,10 +15,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 {
can0 = &flexcan1;
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 015/219] ARM: dts: imx6sl: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (5 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 014/219] ARM: dts: imx6sx: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 016/219] ARM: dts: imx50: " Sasha Levin
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 7fa8ab65ee15e386558ac5e971004712da91e2dd ]
Boards based on imx6sl have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sl.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx6sl-evk.dts | 1 +
arch/arm/boot/dts/imx6sl-warp.dts | 1 +
arch/arm/boot/dts/imx6sl.dtsi | 2 --
arch/arm/boot/dts/imx6sll-evk.dts | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 679b4482ab13a..f7a48e4622e1b 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -17,6 +17,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x40000000>;
};
diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts
index 404e602e67813..408da704c459b 100644
--- a/arch/arm/boot/dts/imx6sl-warp.dts
+++ b/arch/arm/boot/dts/imx6sl-warp.dts
@@ -55,6 +55,7 @@
compatible = "warp,imx6sl-warp", "fsl,imx6sl";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 2fa88c6f18820..55d1872aa81a8 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.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;
diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts
index c8e115564ba2c..0c2406ac8a638 100644
--- a/arch/arm/boot/dts/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/imx6sll-evk.dts
@@ -20,6 +20,7 @@
};
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x80000000>;
};
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 016/219] ARM: dts: imx50: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (6 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 015/219] ARM: dts: imx6sl: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: " Sasha Levin
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit aab5e3ea95b958cf22a24e756a84e635bdb081c1 ]
imx50-evk has duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx50.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx50-evk.dts | 1 +
arch/arm/boot/dts/imx50.dtsi | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx50-evk.dts b/arch/arm/boot/dts/imx50-evk.dts
index 682a99783ee69..a25da415cb02e 100644
--- a/arch/arm/boot/dts/imx50-evk.dts
+++ b/arch/arm/boot/dts/imx50-evk.dts
@@ -12,6 +12,7 @@
compatible = "fsl,imx50-evk", "fsl,imx50";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x80000000>;
};
};
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index ab522c2da6df6..9e9e92acceb27 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -22,10 +22,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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (7 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 016/219] ARM: dts: imx50: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 018/219] ARM: dts: imx1: " Sasha Levin
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel, linux-stm32
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit b629e83520fafe6f4c2f3e8c88c78a496fc4987c ]
Boards based on imx23 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx23.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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx23-evk.dts | 1 +
arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
arch/arm/boot/dts/imx23-sansa.dts | 1 +
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 +
arch/arm/boot/dts/imx23-xfi3.dts | 1 +
arch/arm/boot/dts/imx23.dtsi | 2 --
6 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index ad2ae25b7b4db..aca27aa2d44bd 100644
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -10,6 +10,7 @@
compatible = "fsl,imx23-evk", "fsl,imx23";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x08000000>;
};
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index e9351774c6199..109f51603d45e 100644
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -20,6 +20,7 @@
compatible = "olimex,imx23-olinuxino", "fsl,imx23";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x04000000>;
};
diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts
index 67de7863ad795..fa22fd9b24129 100644
--- a/arch/arm/boot/dts/imx23-sansa.dts
+++ b/arch/arm/boot/dts/imx23-sansa.dts
@@ -50,6 +50,7 @@
compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x04000000>;
};
diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
index 95c7b918f6d60..aab029349420d 100644
--- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts
+++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
@@ -17,6 +17,7 @@
compatible = "fsl,stmp378x-devb", "fsl,imx23";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x04000000>;
};
diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts
index 9616e500b9961..2b5df8dfd3ff3 100644
--- a/arch/arm/boot/dts/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/imx23-xfi3.dts
@@ -49,6 +49,7 @@
compatible = "creative,x-fi3", "fsl,imx23";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x04000000>;
};
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 71bfd2b15609a..aaaa987d8eff9 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.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 {
gpio0 = &gpio0;
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 018/219] ARM: dts: imx1: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (8 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 019/219] ARM: dts: imx27: " Sasha Levin
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 62864d5665c4fc636d3021f829b3ac00fa058e30 ]
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 a1d81badb5c8a..119b19ba53b6d 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>;
};
};
diff --git a/arch/arm/boot/dts/imx1-apf9328.dts b/arch/arm/boot/dts/imx1-apf9328.dts
index 11515c0cb195c..ee4b1b106b1ae 100644
--- a/arch/arm/boot/dts/imx1-apf9328.dts
+++ b/arch/arm/boot/dts/imx1-apf9328.dts
@@ -21,6 +21,7 @@
};
memory@8000000 {
+ device_type = "memory";
reg = <0x08000000 0x00800000>;
};
};
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index 3edc7b5550d88..2b6e77029de4d 100644
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -15,10 +15,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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 019/219] ARM: dts: imx27: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (9 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 018/219] ARM: dts: imx1: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 020/219] ARM: dts: imx25: " Sasha Levin
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 38715dcd49b4430ac5b6bc1293278d91a4d32bd5 ]
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 3eddd805a793a..f635d5c5029c4 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 9c455dcbe6ebf..c85f9d01768a1 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 f9a882d991329..35123b7cb6b3e 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 cbad7c88c58cc..b0b4f7c00246d 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 ec466b4bfd410..0935e1400e5d2 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 753d88df16274..39e75b997bdc8 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 020/219] ARM: dts: imx25: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (10 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 019/219] ARM: dts: imx27: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 021/219] ARM: dts: imx53-voipac-dmm-668: " Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 024/219] ARM: dts: Fix hsi gdd range for omap4 Sasha Levin
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Rob Herring, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 59d8bb363f563e4a147a291037bf979cb8ff9a59 ]
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 e316fe08837a3..e4d7da267532d 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 5cb6967866c0a..f37e9a75a3ca7 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 a5626b46ac4e1..f8544a9e46330 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 85c15ee632727..8c8ad80de4614 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.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 021/219] ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (11 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 020/219] ARM: dts: imx25: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 024/219] ARM: dts: Fix hsi gdd range for omap4 Sasha Levin
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Fabio Estevam, Marco Franchi, Shawn Guo, Sasha Levin, devicetree,
linux-arm-kernel
From: Fabio Estevam <festevam@gmail.com>
[ Upstream commit 998a84c27a7f3f9133d32af64e19c05cec161a1a ]
imx53-voipac-dmm-668 has two memory nodes, but the correct representation
would be to use a single one with two reg entries - one for each RAM chip
select, so fix it accordingly.
Reported-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi b/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
index f83a8c62ea531..d595034f3f1bf 100644
--- a/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
+++ b/arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
@@ -17,12 +17,8 @@
memory@70000000 {
device_type = "memory";
- reg = <0x70000000 0x20000000>;
- };
-
- memory@b0000000 {
- device_type = "memory";
- reg = <0xb0000000 0x20000000>;
+ reg = <0x70000000 0x20000000>,
+ <0xb0000000 0x20000000>;
};
regulators {
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH AUTOSEL 4.19 024/219] ARM: dts: Fix hsi gdd range for omap4
2019-11-22 5:26 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
` (12 preceding siblings ...)
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 021/219] ARM: dts: imx53-voipac-dmm-668: " Sasha Levin
@ 2019-11-22 5:26 ` Sasha Levin
13 siblings, 0 replies; 16+ messages in thread
From: Sasha Levin @ 2019-11-22 5:26 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tony Lindgren, Sebastian Reichel, Sasha Levin, linux-omap, devicetree
From: Tony Lindgren <tony@atomide.com>
[ Upstream commit e9e685480b74aef3f3d0967dadb52eea3ff625d2 ]
While reviewing the missing mcasp ranges I noticed omap4 hsi range
for gdd is wrong so let's fix it.
I'm not aware of any omap4 devices in mainline kernel though that use
hsi though.
Fixes: 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe
them with ti-sysc")
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/omap4-l4.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi
index 6eb26b837446c..5059ecac44787 100644
--- a/arch/arm/boot/dts/omap4-l4.dtsi
+++ b/arch/arm/boot/dts/omap4-l4.dtsi
@@ -196,12 +196,12 @@
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
- ranges = <0x0 0x58000 0x4000>;
+ ranges = <0x0 0x58000 0x5000>;
hsi: hsi@0 {
compatible = "ti,omap4-hsi";
reg = <0x0 0x4000>,
- <0x4a05c000 0x1000>;
+ <0x5000 0x1000>;
reg-names = "sys", "gdd";
clocks = <&l3_init_clkctrl OMAP4_HSI_CLKCTRL 0>;
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread