korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 10:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: imx6ul: Fix memory node duplication

Browse Source 
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>
This commit is contained in:
Fabio Estevam 2018-11-20 13:59:43 -02:00 committed by Shawn Guo
parent 76368cca63
commit 750d8df6e7
10 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
View File

@ -12,6 +12,7 @@
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};

1
arch/arm/boot/dts/imx6ul-geam.dts
View File

@ -15,6 +15,7 @@
compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x08000000>;
};

1
arch/arm/boot/dts/imx6ul-isiot.dtsi
View File

@ -10,6 +10,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};

1
arch/arm/boot/dts/imx6ul-litesom.dtsi
View File

@ -48,6 +48,7 @@
compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};

1
arch/arm/boot/dts/imx6ul-opos6ul.dtsi
View File

@ -49,6 +49,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};

1
arch/arm/boot/dts/imx6ul-pico-hobbit.dts
View File

@ -53,6 +53,7 @@
/* Will be filled by the bootloader */
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>;
};

1
arch/arm/boot/dts/imx6ul-tx6ul.dtsi
View File

@ -71,6 +71,7 @@
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};

2
arch/arm/boot/dts/imx6ul.dtsi
View File

@ -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 {
ethernet0 = &fec1;

1
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
View File

@ -7,6 +7,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};

1
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
View File

@ -7,6 +7,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};