diff options
author | Fabio Estevam <festevam@gmail.com> | 2018-11-26 13:40:54 +0100 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 03:02:58 +0100 |
commit | 59d8bb363f563e4a147a291037bf979cb8ff9a59 (patch) | |
tree | c07276f255661ecf948277bb4efc9475f4abd98d /arch/arm/boot/dts/imx25.dtsi | |
parent | ARM: dts: imx27: Fix memory node duplication (diff) | |
download | linux-59d8bb363f563e4a147a291037bf979cb8ff9a59.tar.xz linux-59d8bb363f563e4a147a291037bf979cb8ff9a59.zip |
ARM: dts: imx25: Fix memory node duplication
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>
Diffstat (limited to 'arch/arm/boot/dts/imx25.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx25.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index e80101847aff..9a097ef014af 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; |