arm64: dts: fvp/juno: Fix bus node names

Most Arm Ltd. boards are employing a layered bus structure, to map
the hardware design (SoC, motherboard, IOFPGA) and structure the DTs.

The "simple-bus" nodes only allow a limited set of node names. Switch
to use *-bus to be binding compliant.

This relies on a pending dt-schema.git fix for now:
https://github.com/devicetree-org/dt-schema/pull/38

Link: https://lore.kernel.org/r/20200513103016.130417-16-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index f4a65d693f157656fdcb94061bac6c56ebe38617..f5c8f07b49186dbd020e54c5ba3b3a1d6b10aacf 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -174,7 +174,7 @@
        };
 
        bus@8000000 {
-               motherboard {
+               motherboard-bus {
                        model = "V2M-P1";
                        arm,hbi = <0x190>;
                        arm,vexpress,site = <0>;
@@ -220,7 +220,7 @@
                                port1-otg;
                        };
 
-                       iofpga@300000000 {
+                       iofpga-bus@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index e226c5e080c298983ddf7db6f166c8f6c85dbccc..05ae893d1b2ee7aaf048b353fd829eb2ae5b96ad 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -178,7 +178,7 @@
                        interrupts = <15>;
                };
 
-               iofpga@300000000 {
+               iofpga-bus@300000000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index ee860d53939537b12bda671c23eb31adbb89e0ab..bd4e0b15f9c84d04eee511b79206d5ee45b70b2f 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -828,7 +828,7 @@
                                <0 0 12 &gic 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
        };
 
-       site2: tlx@60000000 {
+       site2: tlx-bus@60000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index f3279327a66542785b7ca2b0a5f14e25b55b2380..eeee51f1251bf91d7511be10356aed566511b5a6 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -92,7 +92,7 @@
        };
 
        bus@8000000 {
-               motherboard {
+               motherboard-bus {
                        compatible = "arm,vexpress,v2p-p1", "simple-bus";
                        #address-cells = <2>;  /* SMB chipselect number and offset */
                        #size-cells = <1>;
@@ -133,7 +133,7 @@
                                vddvario-supply = <&mb_fixed_3v3>;
                        };
 
-                       iofpga@300000000 {
+                       iofpga-bus@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
index 350cbf17e8b419e90016f476bfb9c2bbab8d19c7..b917d9d3f1c4c16550d7cde7e1dc47f18aefb270 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
@@ -6,10 +6,10 @@
  */
 / {
        bus@8000000 {
-               motherboard {
+               motherboard-bus {
                        arm,v2m-memory-map = "rs2";
 
-                       iofpga@300000000 {
+                       iofpga-bus@300000000 {
                                virtio-p9@140000 {
                                        compatible = "virtio,mmio";
                                        reg = <0x140000 0x200>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index b81651b1890a523a2d1b5ede26a290bf7b0c8212..001a0a3c7f66dd9c36920ac297d28556d814e7e3 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -77,7 +77,7 @@
        };
 
        bus@8000000 {
-               motherboard {
+               motherboard-bus {
                        arm,v2m-memory-map = "rs1";
                        compatible = "arm,vexpress,v2m-p1", "simple-bus";
                        #address-cells = <2>; /* SMB chipselect number and offset */
@@ -98,7 +98,7 @@
                                interrupts = <15>;
                        };
 
-                       iofpga@300000000 {
+                       iofpga-bus@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;