Commit bd7aff03 authored by Linus Walleij's avatar Linus Walleij Committed by Sudeep Holla
Browse files

ARM: dts: vexpress: Restructure motherboard includes 



It is a bit unorthodox to just include a file in the middle of a another
DTS file, it breaks the pattern from other device trees and also makes
it really hard to reference things across the files with phandles.

Restructure the include for the Versatile Express motherboards to happen
at the top of the file, reference the target nodes directly, and indent
the motherboard .dtsi files to reflect their actual depth in the
hierarchy.

This is a purely syntactic change that result in the same DTB files from
the DTS/DTSI files.

Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 60cc43fc

arch/arm/boot/dts/vexpress-v2m-rs1.dtsi

+355 −351
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 * CHANGES TO vexpress-v2m.dtsi!

 */



/ {

	smb@8000000 {

		motherboard {

			model = "V2M-P1";

			arm,hbi = <0x190>;
@@ -440,3 +442,5 @@ 
				};

			};

		};

	};

};

arch/arm/boot/dts/vexpress-v2m.dtsi

+354 −350
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
 * CHANGES TO vexpress-v2m-rs1.dtsi!

 */



/ {

	smb@4000000 {

		motherboard {

			model = "V2M-P1";

			arm,hbi = <0x190>;
@@ -440,3 +442,5 @@ 
				};

			};

		};

	};

};
 
 No newline at end of file

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



/dts-v1/;

#include "vexpress-v2m-rs1.dtsi"



/ {

	model = "V2P-CA15";
@@ -278,8 +279,6 @@ 
				<0 0 40 &gic 0 40 4>,

				<0 0 41 &gic 0 41 4>,

				<0 0 42 &gic 0 42 4>;



		/include/ "vexpress-v2m-rs1.dtsi"

	};



	site2: hsb@40000000 {

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+2 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



/dts-v1/;

#include "vexpress-v2m-rs1.dtsi"



/ {

	model = "V2P-CA15_CA7";
@@ -584,7 +585,7 @@ 
		};

	};



	smb@8000000 {

	smb: smb@8000000 {

		compatible = "simple-bus";



		#address-cells = <2>;
@@ -641,8 +642,6 @@ 
				<0 0 40 &gic 0 40 4>,

				<0 0 41 &gic 0 41 4>,

				<0 0 42 &gic 0 42 4>;



		/include/ "vexpress-v2m-rs1.dtsi"

	};



	site2: hsb@40000000 {

arch/arm/boot/dts/vexpress-v2p-ca5s.dts

+2 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



/dts-v1/;

#include "vexpress-v2m-rs1.dtsi"



/ {

	model = "V2P-CA5s";
@@ -191,7 +192,7 @@ 
		};

	};



	smb@8000000 {

	smb: smb@8000000 {

		compatible = "simple-bus";



		#address-cells = <2>;
@@ -248,8 +249,6 @@ 
				<0 0 40 &gic 0 40 4>,

				<0 0 41 &gic 0 41 4>,

				<0 0 42 &gic 0 42 4>;



		/include/ "vexpress-v2m-rs1.dtsi"

	};



	site2: hsb@40000000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE