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>

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 7d832247d0dbca1418d07a11ab34ffe2c8f0734d..580afaee978fc0b7f8a9f7d18c7aae37d89d7d00 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -1,3 +1,6 @@
+#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>;
        };
+};

diff --git a/arch/arm64/boot/dts/arm/juno-clocks.dtsi b/arch/arm64/boot/dts/arm/juno-clocks.dtsi
index 25352ed943e6e04a98689106b94994e8269a31fb..e5e265dfa902500e8a139d08e57663d462a7d154 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-clocks.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-clocks.dtsi
@@ -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";
        };
+};

diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index eec37feee8fcbd65f72775cc791ded7be84fce32..b883a8afb6f46bf7f5e28fea219705053ebf9477 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -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 {

diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 28f40ec44090ecda65d0c3ad65525c93166dc828..cfd8150bf30ac4c106696925e7332c27e7f2fc11 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -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 {

diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index ac5ceb73f45fb9d2b9be24e81b6afbfdf8a09a82..9967c808a92df71a54e4f36ec3100e0025f7b914 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -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 {