diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-11-20 13:59:43 -0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:43 +0100 |
| commit | b3ab937f62d8683e0035df084ddbacc6eec414e6 (patch) | |
| tree | 7f0f0f1d54420d0c35e71ddf2cd70356525851a5 /arch/arm/boot | |
| parent | 0644c7f308e82f6150e089affc18643513444926 (diff) | |
ARM: dts: imx6ul: Fix memory node duplication
Boards based on imx6ul have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6ul.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 750d8df6e7b269b828f66631a1d39ea027afc92a)
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-geam.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 |
9 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts index 571eea7f1c6b..6ee1643ab6a4 100644 --- a/arch/arm/boot/dts/imx6ul-geam.dts +++ b/arch/arm/boot/dts/imx6ul-geam.dts @@ -51,6 +51,7 @@ compatible = "engicam,imx6ul-geam", "fsl,imx6ul"; memory { + device_type = "memory"; reg = <0x80000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index 44a4e203d71b..6189af234fc2 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -46,6 +46,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi index 039721d3dcb4..8d878852e91f 100644 --- a/arch/arm/boot/dts/imx6ul-litesom.dtsi +++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi @@ -48,6 +48,7 @@ compatible = "grinn,imx6ul-litesom", "fsl,imx6ul"; memory { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; }; diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi index aec5ccce0321..47d11f7b1f96 100644 --- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi @@ -49,6 +49,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0>; /* will be filled by U-Boot */ }; diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts index 7d7254b12a75..e6a5f5f2d2c1 100644 --- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts +++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts @@ -53,6 +53,7 @@ memory { reg = <0x80000000 0x10000000>; + device_type = "memory"; }; chosen { diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi index ec745eb3b6a8..18e87f4b4ac4 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi @@ -71,7 +71,8 @@ }; memory { - reg = <0 0>; /* will be filled by U-Boot */ + device_type = "memory"; + reg = <0x80000000 0>; /* will be filled by U-Boot */ }; clocks { diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index 5a9ad916f952..fdba04fe2d6d 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -20,7 +20,6 @@ * 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"; reg = <0 0>; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi index cfda666a34f4..5319efd3741a 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -7,6 +7,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0x10000000>; }; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index f48291b7cbf0..1908e341e2e2 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -7,6 +7,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; |