diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-06 13:40:47 -0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:41 +0100 |
| commit | 7dfcd6cfb8abe59c345a86aac11627bd15c5bab3 (patch) | |
| tree | 92e455644f154534f86b1cd1b1f0767a9117b0a9 /arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | |
| parent | 9cc7dccbadbd2905449ed6b3b9d7aa8d9f108927 (diff) | |
ARM: dts: imx7: Fix memory node duplication
Boards based on imx7 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx7s.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>
(cherry picked from commit 29988e867cb17de7119e971f9acfad2c3fccdb47)
Conflicts:
arch/arm/boot/dts/imx7d-cl-som-imx7.dts
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
arch/arm/boot/dts/imx7d-colibri.dtsi
arch/arm/boot/dts/imx7d-nitrogen7.dts
arch/arm/boot/dts/imx7d-pico.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
arch/arm/boot/dts/imx7s-colibri.dtsi
arch/arm/boot/dts/imx7s-warp.dts
arch/arm/boot/dts/imx7s.dtsi
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-colibri-emmc.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi index 9b63b9c89e4b..92fe9f7a34f6 100644 --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi @@ -8,6 +8,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; }; |