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

Commit d29e849c authored by Sudeep Holla's avatar Sudeep Holla
Browse files

arm64: dts: juno: remove dtsi nesting inside tree structure 



Currently juno-clock.dtsi and juno-base.dtsi are nested badly inside
the device tree structure. It's generally good practice to ensure that
individual dtsi stand by themselves at the top of the file.

This patch removes the nesting of the above mentioned dtsi files and
makes them independent.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 7ce7d89f

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

+4 −2
Original line number Diff line number Diff line 
#include "juno-clocks.dtsi"



/ {

	/*

	 *  Devices shared by all Juno boards

	 */
@@ -507,8 +510,6 @@ 
		};

	};



	/include/ "juno-clocks.dtsi"



	smmu_dma: iommu@7fb00000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x7fb00000 0x0 0x10000>;
@@ -719,3 +720,4 @@ 
		interrupt-map-mask = <0 0>;

		interrupt-map = <0 0 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>;

	};

};

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

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This file is licensed under a dual GPLv2 or BSD license.

 *

 */



/ {

	/* SoC fixed clocks */

	soc_uartclk: refclk7273800hz {

		compatible = "fixed-clock";
@@ -42,3 +42,4 @@ 
		clock-frequency = <400000000>;

		clock-output-names = "faxi_clk";

	};

};

arch/arm64/boot/dts/arm/juno-r1.dts

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "juno-base.dtsi"



/ {

	model = "ARM Juno development board (r1)";
@@ -176,8 +177,6 @@ 
				     <&A53_2>,

				     <&A53_3>;

	};



	#include "juno-base.dtsi"

};



&memtimer {

arch/arm64/boot/dts/arm/juno-r2.dts

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "juno-base.dtsi"



/ {

	model = "ARM Juno development board (r2)";
@@ -176,8 +177,6 @@ 
				     <&A53_2>,

				     <&A53_3>;

	};



	#include "juno-base.dtsi"

};



&memtimer {

arch/arm64/boot/dts/arm/juno.dts

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "juno-base.dtsi"



/ {

	model = "ARM Juno development board (r0)";
@@ -176,8 +177,6 @@ 
				     <&A53_2>,

				     <&A53_3>;

	};



	#include "juno-base.dtsi"

};



&etm0 {