diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-20 18:59:45 +0300 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 05:02:34 +0300 |
| commit | 7fa8ab65ee15e386558ac5e971004712da91e2dd (patch) | |
| tree | bfa230a850347f7cff1a76855e823d77538758a7 /arch/arm/boot/dts/imx6sl.dtsi | |
| parent | 216f35fedd8688c8b654ebfbad18c6e64713fad7 (diff) | |
| download | linux-7fa8ab65ee15e386558ac5e971004712da91e2dd.tar.xz | |
ARM: dts: imx6sl: Fix memory node duplication
Boards based on imx6sl have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sl.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/imx6sl.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sl.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 97e49aa7b033..e7524e73efb4 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.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 { ethernet0 = &fec; |