Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: vf: Fix memory node duplication

Boards based on vf500/vf600 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the vf500.dtsi/vf610m4.dtsi files.

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>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Fabio Estevam and committed by
Shawn Guo
f535d100 d7f3894f

+9 -2
+1
arch/arm/boot/dts/vf500-colibri.dtsi
··· 47 47 compatible = "toradex,vf610-colibri_vf50", "fsl,vf500"; 48 48 49 49 memory@80000000 { 50 + device_type = "memory"; 50 51 reg = <0x80000000 0x8000000>; 51 52 }; 52 53
-1
arch/arm/boot/dts/vf500.dtsi
··· 10 10 #size-cells = <1>; 11 11 chosen { }; 12 12 aliases { }; 13 - memory { device_type = "memory"; }; 14 13 15 14 cpus { 16 15 #address-cells = <1>;
+1
arch/arm/boot/dts/vf610-bk4.dts
··· 16 16 }; 17 17 18 18 memory@80000000 { 19 + device_type = "memory"; 19 20 reg = <0x80000000 0x8000000>; 20 21 }; 21 22
+1
arch/arm/boot/dts/vf610-colibri.dtsi
··· 47 47 compatible = "toradex,vf610-colibri_vf61", "fsl,vf610"; 48 48 49 49 memory@80000000 { 50 + device_type = "memory"; 50 51 reg = <0x80000000 0x10000000>; 51 52 }; 52 53 };
+1
arch/arm/boot/dts/vf610-cosmic.dts
··· 20 20 }; 21 21 22 22 memory@80000000 { 23 + device_type = "memory"; 23 24 reg = <0x80000000 0x10000000>; 24 25 }; 25 26
+1
arch/arm/boot/dts/vf610-twr.dts
··· 14 14 }; 15 15 16 16 memory@80000000 { 17 + device_type = "memory"; 17 18 reg = <0x80000000 0x8000000>; 18 19 }; 19 20
+1
arch/arm/boot/dts/vf610-zii-cfu1.dts
··· 16 16 }; 17 17 18 18 memory@80000000 { 19 + device_type = "memory"; 19 20 reg = <0x80000000 0x20000000>; 20 21 }; 21 22
+1
arch/arm/boot/dts/vf610-zii-dev.dtsi
··· 50 50 }; 51 51 52 52 memory@80000000 { 53 + device_type = "memory"; 53 54 reg = <0x80000000 0x20000000>; 54 55 }; 55 56
+1
arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
··· 24 24 }; 25 25 26 26 memory@80000000 { 27 + device_type = "memory"; 27 28 reg = <0x80000000 0x20000000>; 28 29 }; 29 30
+1
arch/arm/boot/dts/vf610m4-colibri.dts
··· 55 55 }; 56 56 57 57 memory@8c000000 { 58 + device_type = "memory"; 58 59 reg = <0x8c000000 0x3000000>; 59 60 }; 60 61 };
-1
arch/arm/boot/dts/vf610m4.dtsi
··· 50 50 #size-cells = <1>; 51 51 chosen { }; 52 52 aliases { }; 53 - memory { device_type = "memory"; }; 54 53 }; 55 54 56 55 &mscm_ir {