Commit f535d100 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent d7f3894f

arch/arm/boot/dts/vf500-colibri.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
	compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x8000000>;

	};

arch/arm/boot/dts/vf500.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
	#size-cells = <1>;

	chosen { };

	aliases { };

	memory { device_type = "memory"; };



	cpus {

		#address-cells = <1>;

arch/arm/boot/dts/vf610-bk4.dts

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x8000000>;

	};

arch/arm/boot/dts/vf610-colibri.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
	compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x10000000>;

	};

};

arch/arm/boot/dts/vf610-cosmic.dts

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x10000000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE