brain-hackers_pepepper-mirror/linux-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/linux-brain.git synced 2024-06-09 23:36:23 +09:00
Code Issues Projects Releases Wiki Activity

ARM: dts: imx6sx: Fix memory node duplication

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

1
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
View File

@ -12,6 +12,7 @@
compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};

1
arch/arm/boot/dts/imx6sx-sabreauto.dts
View File

@ -11,6 +11,7 @@
compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};

1
arch/arm/boot/dts/imx6sx-sdb.dtsi
View File

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

1
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
View File

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

1
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
View File

@ -49,6 +49,7 @@
compatible = "udoo,neobasic", "fsl,imx6sx";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};

1
arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
View File

@ -49,6 +49,7 @@
compatible = "udoo,neoextended", "fsl,imx6sx";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};

1
arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
View File

@ -49,6 +49,7 @@
compatible = "udoo,neofull", "fsl,imx6sx";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
};

2
arch/arm/boot/dts/imx6sx.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 {
can0 = &flexcan1;