arm64: dts: marvell: Use preferred node names for "simple-bus"

The "simple-bus" binding has preferred node names such as "bus",
".*-bus", or "soc". Rename the Marvell platforms to use these names.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
index 75377c292bcb6a57ea12215a9f4439c600942161..605f5be1538c863e4072770a1cb649b02dc326e6 100644 (file)
--- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
@@ -78,7 +78,7 @@
                #size-cells = <2>;
                ranges;
 
-               internal-regs@7f000000 {
+               bus@7f000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 4e5ff7f67e33b67583fff5ef950c079a8798180e..75b0fdc3efb2e9a59c1ff4008dba4b52d14a2594 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -76,7 +76,7 @@
                #size-cells = <2>;
                ranges;
 
-               internal-regs@d0000000 {
+               bus@d0000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index ecfd5f70190b2b2bf23f50f7344f70cd6509af6b..73a570cf10108bd5108a0e388e3522358dff0113 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -5,7 +5,6 @@
  * Device Tree file for Marvell Armada AP806.
  */
 
-#define AP_NAME                ap806
 #include "armada-ap80x.dtsi"
 
 &ap_syscon0 {

diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
index 550bdba7aeb9efb13420ed7601ef99f03faa6312..196793d8715cf7dd33f5df455250de1e767a3cc3 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
@@ -5,7 +5,6 @@
  * Copyright (C) 2019 Marvell Technology Group Ltd.
  */
 
-#define AP_NAME                ap807
 #include "armada-ap80x.dtsi"
 
 &ap_syscon0 {

diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
index e206d03a2867da3baa43faed5af49d6fcb80be98..40e1469829212667fc7c8bb66dc705306f0fdc9b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
@@ -63,14 +63,14 @@
                interrupts = <17>;
        };
 
-       AP_NAME {
+       soc {
                #address-cells = <2>;
                #size-cells = <2>;
                compatible = "simple-bus";
                interrupt-parent = <&gic>;
                ranges;
 
-               config-space@f0000000 {
+               bus@f0000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";

diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
index b239df244ec5936fecf0cd3816ef312933ca60ce..abb37e5fc2c0a57150a0cfe3bc10b06ba96fd0ac 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
@@ -32,13 +32,13 @@
                                <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
        };
 
-       ap810-ap0 {
+       soc {
                #address-cells = <2>;
                #size-cells = <2>;
                compatible = "simple-bus";
                ranges;
 
-               config-space@e8000000 {
+               bus@e8000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        compatible = "simple-bus";

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 161beec0b6b062e5d172855757cfacfc539c693c..a057e119492fd3abe0e34749e05b7b9efa3afa07 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -17,7 +17,7 @@
         * The contents of the node are defined below, in order to
         * save one indentation level
         */
-       CP11X_NAME: CP11X_NAME { };
+       CP11X_NAME: CP11X_NODE_NAME(bus) { };
 
        /*
         * CPs only have one sensor in the thermal IC.
@@ -51,7 +51,7 @@
        interrupt-parent = <&CP11X_LABEL(icu_nsr)>;
        ranges;
 
-       config-space@CP11X_BASE {
+       bus@CP11X_BASE {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "simple-bus";