From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sasha Levin <sashal@kernel.org>, Rob Herring <robh@kernel.org>,
devicetree@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: Fix memory node duplication
Date: Fri, 22 Nov 2019 00:26:39 -0500 [thread overview]
Message-ID: <20191122053001.752-10-sashal@kernel.org> (raw)
In-Reply-To: <20191122053001.752-1-sashal@kernel.org>
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Fabio Estevam <festevam@gmail.com>, Rob Herring <robh@kernel.org>,
Shawn Guo <shawnguo@kernel.org>, Sasha Levin <sashal@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com
Subject: [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: Fix memory node duplication
Date: Fri, 22 Nov 2019 00:26:39 -0500 [thread overview]
Message-ID: <20191122053001.752-10-sashal@kernel.org> (raw)
In-Reply-To: <20191122053001.752-1-sashal@kernel.org>
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
next prev parent reply other threads:[~2019-11-22 5:32 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
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 009/219] ARM: dts: imx53: " 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
2019-11-22 5:26 ` Sasha Levin
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 012/219] ARM: dts: imx7: " 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
2019-11-22 5:26 ` Sasha Levin
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 015/219] ARM: dts: imx6sl: " 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
2019-11-22 5:26 ` Sasha Levin
2019-11-22 5:26 ` Sasha Levin [this message]
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: " Sasha Levin
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 019/219] ARM: dts: imx27: " 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
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 ` Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 022/219] parisc: Fix serio address output Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 023/219] parisc: Fix HP SDC hpa " Sasha Levin
2019-11-22 5:26 ` [PATCH AUTOSEL 4.19 024/219] ARM: dts: Fix hsi gdd range for omap4 Sasha Levin
-- strict thread matches above, loose matches on Subject: below --
2019-11-22 5:45 [PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication Sasha Levin
2019-11-22 5:45 ` [PATCH AUTOSEL 4.19 017/219] ARM: dts: imx23: " Sasha Levin
2019-11-22 5:45 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191122053001.752-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=robh@kernel.org \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.