diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-23 16:25:19 +0300 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 05:02:38 +0300 |
| commit | aab5e3ea95b958cf22a24e756a84e635bdb081c1 (patch) | |
| tree | 237cb58b7ee26e6f14021209c5cbcccc2c7099c7 /arch/arm/boot/dts | |
| parent | 88d22f13a66cd9a767ae83c0cf8859ade1dd621d (diff) | |
| download | linux-aab5e3ea95b958cf22a24e756a84e635bdb081c1.tar.xz | |
ARM: dts: imx50: Fix memory node duplication
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/imx50-evk.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx50.dtsi | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx50-evk.dts b/arch/arm/boot/dts/imx50-evk.dts index 682a99783ee6..a25da415cb02 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 95b7fba58300..8be4ff4ca4f8 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; |