ARM: dts: meson: group the Cortex-A5 / Cortex-A9 peripherals

The public Meson8b (S805) datasheet describes a memory region called "A9
Periph base" which starts at 0xC4300000 and ends at 0xC430FFFF. Add a
simple-bus node and move all peripherals that are part of this memory
region.
This makes the .dts a bit easier to read. No functional changes.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 0839da07a75ca9e20c7d509bf3137fe7c1bb7801..e4645f61271244fedeb0d128a6ad4535b452b6b2 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -59,14 +59,6 @@
                cache-level = <2>;
        };
 
-       gic: interrupt-controller@c4301000 {
-               compatible = "arm,cortex-a9-gic";
-               reg = <0xc4301000 0x1000>,
-                     <0xc4300100 0x0100>;
-               interrupt-controller;
-               #interrupt-cells = <3>;
-       };
-
        soc {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -207,6 +199,22 @@
                        };
                };
 
+               periph: bus@c4300000 {
+                       compatible = "simple-bus";
+                       reg = <0xc4300000 0x10000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0xc4300000 0x10000>;
+
+                       gic: interrupt-controller@1000 {
+                               compatible = "arm,cortex-a9-gic";
+                               reg = <0x1000 0x1000>,
+                                     <0x100 0x100>;
+                               interrupt-controller;
+                               #interrupt-cells = <3>;
+                       };
+               };
+
                aobus: aobus@c8100000 {
                        compatible = "simple-bus";
                        reg = <0xc8100000 0x100000>;

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index 3be5fbd07997b71f3adf517589ec7cf3600ffc86..28b9f67799930db9fe001d34f95e32c5d1da5df5 100644 (file)
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -129,11 +129,6 @@
                        no-map;
                };
        };
-
-       scu@c4300000 {
-               compatible = "arm,cortex-a9-scu";
-               reg = <0xc4300000 0x100>;
-       };
 }; /* end of / */
 
 &aobus {
@@ -362,6 +357,13 @@
        arm,shared-override;
 };
 
+&periph {
+       scu@0 {
+               compatible = "arm,cortex-a9-scu";
+               reg = <0x0 0x100>;
+       };
+};
+
 &pwm_ab {
        compatible = "amlogic,meson8-pwm", "amlogic,meson8b-pwm";
 };

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 587a855f872bc394b6a3e5c6c86c0816f7da8f45..6b097ab8637f090e128a55645cc0f98a7e36ff08 100644 (file)
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -112,11 +112,6 @@
                        no-map;
                };
        };
-
-       scu@c4300000 {
-               compatible = "arm,cortex-a5-scu";
-               reg = <0xc4300000 0x100>;
-       };
 }; /* end of / */
 
 &aobus {
@@ -349,6 +344,13 @@
        arm,shared-override;
 };
 
+&periph {
+       scu@0 {
+               compatible = "arm,cortex-a5-scu";
+               reg = <0x0 0x100>;
+       };
+};
+
 &pwm_ab {
        compatible = "amlogic,meson8b-pwm";
 };