ARM/arm64: dts: Rename SMB bus to just bus

Discussing the YAML validation schema with the DT maintainers
it came out that a bus named "smb@80000000" is not really
accepted, and the schema was written to name the static memory
bus just "bus@80000000".

This change is necessary for the schema to kick in and validate
these device trees, else the schema gets ignored.

Cc: Rob Herring <[email protected]>
Acked-by: Sudeep Holla <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index dfae90adbb7caa393c0dc9f319c0c09ce6cf40e3..5c183483ec3b6aa4e07b496bae0834605edacc0d 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -19,7 +19,7 @@
  */
 
 / {
-       smb@8000000 {
+       bus@8000000 {
                motherboard {
                        model = "V2M-P1";
                        arm,hbi = <0x190>;

diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index 2e29d77904977f9af454809f979c7ddc85568b27..5e48b641068ad83806efa45c93f31dc6d680b0ca 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -19,7 +19,7 @@
  */
 
 / {
-       smb@4000000 {
+       bus@4000000 {
                motherboard {
                        model = "V2M-P1";
                        arm,hbi = <0x190>;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 0dc4277d5f8bbd53fc12be26e45237fe8b362c5e..f82fa34c90bec085199780c7b033b34f61683c3b 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -236,7 +236,7 @@
                };
        };
 
-       smb@8000000 {
+       bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 1de0a658adf124c4cc7c25ca3eb20096477848d1..3ac95a179452cb54bb7b34cc1c22d34bbaf6d25e 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -608,7 +608,7 @@
                };
        };
 
-       smb: smb@8000000 {
+       smb: bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index d5b47d526f9ef437ec4d3a9dcec27ca29a64367a..7aa64ae2577981469c29b61a9a11eb18587020c7 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -206,7 +206,7 @@
                };
        };
 
-       smb: smb@8000000 {
+       smb: bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index d796efaadbe3a8d56980b95edc815f83fc428213..623246f374485019db2854f4ac0812e5b2f59c5e 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -295,7 +295,7 @@
                };
        };
 
-       smb: smb@4000000 {
+       smb: bus@4000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 3f78373f708a28686509691968f7bf76e0a71054..12f039fa3dadaed2323eafb5c8547d9e5a6a6d24 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -92,7 +92,7 @@
                timeout-sec = <30>;
        };
 
-       smb@8000000 {
+       bus@8000000 {
                compatible = "arm,vexpress,v2m-p1", "simple-bus";
                arm,v2m-memory-map = "rs1";
                #address-cells = <2>; /* SMB chipselect number and offset */

diff --git a/arch/arm64/boot/dts/arm/fvp-base-revc.dts b/arch/arm64/boot/dts/arm/fvp-base-revc.dts
index 62ab0d54ff71ed4f513837d24fdfae1a743f773f..c8ba328ed3fe9db1157ce27f8545d0b8c3ee7c9f 100644 (file)
--- a/arch/arm64/boot/dts/arm/fvp-base-revc.dts
+++ b/arch/arm64/boot/dts/arm/fvp-base-revc.dts
@@ -206,7 +206,7 @@
               };
        };
 
-       smb@8000000 {
+       bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 1f3c80aafbd7e5c6181e4c172ca9d6cb58e86754..f5889281545f7f3b4753f4e70c863f874bd1346e 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -800,7 +800,7 @@
                      <0x00000008 0x80000000 0x1 0x80000000>;
        };
 
-       smb@8000000 {
+       bus@8000000 {
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 9f60dacb4f80fbe193185abb76d70f05a4106eef..e3983ded3c3c588607ab6ba2b4e2ad67314f2211 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -8,7 +8,7 @@
  */
 
 / {
-       smb@8000000 {
+       bus@8000000 {
                mb_clk24mhz: clk24mhz {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 6e685d8833037f9b7e3cb616cc368af40b45bae5..c5d15cbd8cf698e6be87c2dd76ceee604e256f40 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -132,7 +132,7 @@
                };
        };
 
-       smb@8000000 {
+       bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;

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 57b0b9d7f3fae49993d01f824be95d85cfc9d207..60703b5763c6a3625d8db54a289241333e1ffe35 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
@@ -5,7 +5,7 @@
  * "rs2" extension for the v2m motherboard
  */
 / {
-       smb@8000000 {
+       bus@8000000 {
                motherboard {
                        arm,v2m-memory-map = "rs2";
 

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 03a7bf079c8ffd26f3d4c225b82d585ee55a8353..e333c8d2d0e4cde351e5a451265cd7565e39dd68 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -8,7 +8,7 @@
  * VEMotherBoard.lisa
  */
 / {
-       smb@8000000 {
+       bus@8000000 {
                motherboard {
                        arm,v2m-memory-map = "rs1";
                        compatible = "arm,vexpress,v2m-p1", "simple-bus";

diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index 22383c26bb03dbbb92484e55dd670cfd5f6acb66..d859914500a706bbecc4d237b172c042fe8fc560 100644 (file)
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -144,7 +144,7 @@
                };
        };
 
-       smb: smb@8000000 {
+       smb: bus@8000000 {
                compatible = "simple-bus";
 
                #address-cells = <2>;