diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-05 22:14:45 +0100 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 03:01:57 +0100 |
| commit | 6a9681168b83c62abfa457c709f2f4b126bd6b92 (patch) | |
| tree | 921955369c37c0efb0880ef9760c229cb51affe4 /arch/arm/boot/dts/imx51.dtsi | |
| parent | ARM: dts: imx6: add thermal sensor and cooling cells (diff) | |
| download | linux-6a9681168b83c62abfa457c709f2f4b126bd6b92.tar.xz linux-6a9681168b83c62abfa457c709f2f4b126bd6b92.zip | |
ARM: dts: imx51: Fix memory node duplication
Boards based on imx51 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx51.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/imx51.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 67d462715048..7651bedabdfb 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -16,10 +16,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; |