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: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Sudeep Holla 2017-01-17 10:20:59 +00:00
parent 7ce7d89f48
commit d29e849caf
5 changed files with 9 additions and 9 deletions

View file

@ -1,3 +1,6 @@
#include "juno-clocks.dtsi"
/ {
/*
* Devices shared by all Juno boards
*/
@ -507,8 +510,6 @@ gpu1_thermal_zone: gpu1 {
};
};
/include/ "juno-clocks.dtsi"
smmu_dma: iommu@7fb00000 {
compatible = "arm,mmu-401", "arm,smmu-v1";
reg = <0x0 0x7fb00000 0x0 0x10000>;
@ -719,3 +720,4 @@ site2: tlx@60000000 {
interrupt-map-mask = <0 0>;
interrupt-map = <0 0 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>;
};
};

View file

@ -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 @@ soc_faxiclk: refclk400mhz {
clock-frequency = <400000000>;
clock-output-names = "faxi_clk";
};
};

View file

@ -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 @@ pmu_a53 {
<&A53_2>,
<&A53_3>;
};
#include "juno-base.dtsi"
};
&memtimer {

View file

@ -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 @@ pmu_a53 {
<&A53_2>,
<&A53_3>;
};
#include "juno-base.dtsi"
};
&memtimer {

View file

@ -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 @@ pmu_a53 {
<&A53_2>,
<&A53_3>;
};
#include "juno-base.dtsi"
};
&etm0 {