diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-20 13:59:44 -0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 10:02:29 +0800 |
| commit | 216f35fedd8688c8b654ebfbad18c6e64713fad7 (patch) | |
| tree | dbe44cdf4db04000bd29c3cbb2f4f7c4ed65b4db /arch/arm/boot/dts/imx6sx.dtsi | |
| parent | 750d8df6e7b269b828f66631a1d39ea027afc92a (diff) | |
| download | linux-216f35fedd8688c8b654ebfbad18c6e64713fad7.tar.bz2 | |
ARM: dts: imx6sx: Fix memory node duplication
Boards based on imx6sx have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sx.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/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 54262671b053..6c8d2bb09025 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.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 { can0 = &flexcan1; |