Commit d29e849c authored by Sudeep Holla's avatar Sudeep Holla

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
#include "juno-clocks.dtsi"
/ {
/* /*
* Devices shared by all Juno boards * Devices shared by all Juno boards
*/ */
...@@ -507,8 +510,6 @@ gpu1_thermal_zone: gpu1 { ...@@ -507,8 +510,6 @@ gpu1_thermal_zone: gpu1 {
}; };
}; };
/include/ "juno-clocks.dtsi"
smmu_dma: iommu@7fb00000 { smmu_dma: iommu@7fb00000 {
compatible = "arm,mmu-401", "arm,smmu-v1"; compatible = "arm,mmu-401", "arm,smmu-v1";
reg = <0x0 0x7fb00000 0x0 0x10000>; reg = <0x0 0x7fb00000 0x0 0x10000>;
...@@ -719,3 +720,4 @@ site2: tlx@60000000 { ...@@ -719,3 +720,4 @@ site2: tlx@60000000 {
interrupt-map-mask = <0 0>; interrupt-map-mask = <0 0>;
interrupt-map = <0 0 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>; interrupt-map = <0 0 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>;
}; };
};
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* This file is licensed under a dual GPLv2 or BSD license. * This file is licensed under a dual GPLv2 or BSD license.
* *
*/ */
/ {
/* SoC fixed clocks */ /* SoC fixed clocks */
soc_uartclk: refclk7273800hz { soc_uartclk: refclk7273800hz {
compatible = "fixed-clock"; compatible = "fixed-clock";
...@@ -42,3 +42,4 @@ soc_faxiclk: refclk400mhz { ...@@ -42,3 +42,4 @@ soc_faxiclk: refclk400mhz {
clock-frequency = <400000000>; clock-frequency = <400000000>;
clock-output-names = "faxi_clk"; clock-output-names = "faxi_clk";
}; };
};
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/dts-v1/; /dts-v1/;
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "juno-base.dtsi"
/ { / {
model = "ARM Juno development board (r1)"; model = "ARM Juno development board (r1)";
...@@ -176,8 +177,6 @@ pmu_a53 { ...@@ -176,8 +177,6 @@ pmu_a53 {
<&A53_2>, <&A53_2>,
<&A53_3>; <&A53_3>;
}; };
#include "juno-base.dtsi"
}; };
&memtimer { &memtimer {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/dts-v1/; /dts-v1/;
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "juno-base.dtsi"
/ { / {
model = "ARM Juno development board (r2)"; model = "ARM Juno development board (r2)";
...@@ -176,8 +177,6 @@ pmu_a53 { ...@@ -176,8 +177,6 @@ pmu_a53 {
<&A53_2>, <&A53_2>,
<&A53_3>; <&A53_3>;
}; };
#include "juno-base.dtsi"
}; };
&memtimer { &memtimer {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/dts-v1/; /dts-v1/;
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "juno-base.dtsi"
/ { / {
model = "ARM Juno development board (r0)"; model = "ARM Juno development board (r0)";
...@@ -176,8 +177,6 @@ pmu_a53 { ...@@ -176,8 +177,6 @@ pmu_a53 {
<&A53_2>, <&A53_2>,
<&A53_3>; <&A53_3>;
}; };
#include "juno-base.dtsi"
}; };
&etm0 { &etm0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment