diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-06 13:40:45 -0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 10:02:11 +0800 |
| commit | 013d37e4707e24c7b9bc3fc55aeda55ce9c2b262 (patch) | |
| tree | 62d91d9c5f1e81f6167e5a69b3e44ef41ef9199b | |
| parent | d2cf9fd301538267015fdb6a5494da0cc8979868 (diff) | |
| download | linux-013d37e4707e24c7b9bc3fc55aeda55ce9c2b262.tar.bz2 | |
ARM: dts: imx31: Fix memory node duplication
Boards based on imx31 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx31.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>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Tested-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx31-bug.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx31-lite.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx31.dtsi | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx31-bug.dts b/arch/arm/boot/dts/imx31-bug.dts index 6ee4ff8e4e8f..9eb960cc02cc 100644 --- a/arch/arm/boot/dts/imx31-bug.dts +++ b/arch/arm/boot/dts/imx31-bug.dts @@ -17,6 +17,7 @@ compatible = "buglabs,imx31-bug", "fsl,imx31"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>; /* 128M */ }; }; diff --git a/arch/arm/boot/dts/imx31-lite.dts b/arch/arm/boot/dts/imx31-lite.dts index db52ddccabc3..d17abdfb6330 100644 --- a/arch/arm/boot/dts/imx31-lite.dts +++ b/arch/arm/boot/dts/imx31-lite.dts @@ -18,6 +18,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>; }; diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi index af7afccf5f2f..d7f6fb764997 100644 --- a/arch/arm/boot/dts/imx31.dtsi +++ b/arch/arm/boot/dts/imx31.dtsi @@ -10,10 +10,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; |