summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx1.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-26 15:40:52 +0300
committerShawn Guo <shawnguo@kernel.org>2018-12-10 05:02:51 +0300
commit62864d5665c4fc636d3021f829b3ac00fa058e30 (patch)
treec5e1f08d25821d24dc249f7be5846db39d95d08c /arch/arm/boot/dts/imx1.dtsi
parent32018d1525c6b8bcdb0fd99bf61f4e56c3d25963 (diff)
downloadlinux-62864d5665c4fc636d3021f829b3ac00fa058e30.tar.xz
ARM: dts: imx1: Fix memory node duplication
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>
Diffstat (limited to 'arch/arm/boot/dts/imx1.dtsi')
-rw-r--r--arch/arm/boot/dts/imx1.dtsi2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index b00ece16b853..b30448cde582 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;