Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 349b0f95 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

arm64: dts: juno/rtsm: re-structure 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 Juno/RTSM 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. This is based on similar patch from Linus Walleij
for ARM Vexpress platforms.

Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 506eeeab

arch/arm64/boot/dts/arm/juno-base.dtsi

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "juno-clocks.dtsi"

#include "juno-motherboard.dtsi"



/ {

	/*
@@ -795,8 +796,6 @@ 
				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,

				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;



		/include/ "juno-motherboard.dtsi"

	};



	site2: tlx@60000000 {

arch/arm64/boot/dts/arm/juno-motherboard.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *

 */



/ {

	smb@8000000 {

		mb_clk24mhz: clk24mhz {

			compatible = "fixed-clock";

			#clock-cells = <0>;
@@ -287,3 +289,5 @@ 
				};

			};

		};

	};

};

arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts

+2 −2
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


/memreserve/ 0x80000000 0x00010000;



#include "rtsm_ve-motherboard.dtsi"



/ {

	model = "RTSM_VE_AEMv8A";

	compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
@@ -162,7 +164,5 @@ 
				<0 0 40 &gic 0 40 4>,

				<0 0 41 &gic 0 41 4>,

				<0 0 42 &gic 0 42 4>;



		/include/ "rtsm_ve-motherboard.dtsi"

	};

};

arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi

+228 −225
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
 *

 * VEMotherBoard.lisa

 */



/ {

	smb@8000000 {

		motherboard {

			arm,v2m-memory-map = "rs1";

			compatible = "arm,vexpress,v2m-p1", "simple-bus";
@@ -274,3 +275,5 @@ 
				};

			};

		};

	};

};