summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx23.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-26 15:08:55 +0300
committerShawn Guo <shawnguo@kernel.org>2018-12-10 05:02:43 +0300
commitb629e83520fafe6f4c2f3e8c88c78a496fc4987c (patch)
treeb2507d693c0a9c089462de7b1673c559a8e3e91e /arch/arm/boot/dts/imx23.dtsi
parent07a4b4600974c5473131dc3a48a532128ee094d3 (diff)
downloadlinux-b629e83520fafe6f4c2f3e8c88c78a496fc4987c.tar.xz
ARM: dts: imx23: Fix memory node duplication
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>
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
-rw-r--r--arch/arm/boot/dts/imx23.dtsi2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index ea259927eef6..8257630f7a49 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;