ARM: dts: imx: use generic name bus

Synchronize the u-boot and kernel imx device trees, using tuned
script from commit c0157bdcafa1 ("ARM: dts: imx: use generic name bus")

Per devicetree specification, generic names are recommended to be
used, such as bus.

i.MX AIPS is an AHB - IP bridge bus, so we could use bus as node
name.

Script:
sed -i "s/\<aips@/bus@/" arch/arm/dts/imx*.dtsi
sed -i "s/\<aips@/bus@/" arch/arm/dts/vf*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/imx*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/vf*.dtsi

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
index bc4b3483a6b4b8ddd1dd587c4c9b82cbbb7e617b..869adb9dada4a9b4a87ea8ebe06d8ebace3b1be4 100644 (file)
--- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
@@ -7,7 +7,7 @@
        soc {
                u-boot,dm-pre-reloc;
 
-               aips@50000000 {
+               bus@50000000 {
                        u-boot,dm-pre-reloc;
                };
        };

diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi
index ed341cfd9d097a4298f219be355c67c8fc02328e..8536f59f59e6eb2d51c064f7600e071489c6ba66 100644 (file)
--- a/arch/arm/dts/imx53.dtsi
+++ b/arch/arm/dts/imx53.dtsi
@@ -222,7 +222,7 @@
                        clock-names = "core_clk", "mem_iface_clk";
                };
 
-               aips@50000000 { /* AIPS1 */
+               bus@50000000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -654,7 +654,7 @@
                        };
                };
 
-               aips@60000000 { /* AIPS2 */
+               bus@60000000 {  /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi
index f0607eb41df42ae00cb517878c347f50f37b9640..ae5aad6b9efcdabf345c1f0747efc456f52ebf0c 100644 (file)
--- a/arch/arm/dts/imx6dl.dtsi
+++ b/arch/arm/dts/imx6dl.dtsi
@@ -84,7 +84,7 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        iomuxc: iomuxc@20e0000 {
                                compatible = "fsl,imx6dl-iomuxc";
                        };
@@ -100,7 +100,7 @@
                        };
                };
 
-               aips2: aips-bus@2100000 {
+               aips2: bus@2100000 {
                        i2c4: i2c@21f8000 {
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi
index aa660b5aeb6513b65480e881f4195af259d91e9b..ced4dacc7357e43b68375f2a510d31a519154083 100644 (file)
--- a/arch/arm/dts/imx6q-display5-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi
@@ -23,7 +23,7 @@
        soc {
                u-boot,dm-pre-reloc;
 
-               aips-bus@2100000 {
+               bus@2100000 {
                        u-boot,dm-pre-reloc;
                };
        };

diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi
index 71543a4a68441eac7cc8a4a60b95bf019a97bc3a..c37484dce35ff49cf2a83f7f269faf1b1be0cf8b 100644 (file)
--- a/arch/arm/dts/imx6q.dtsi
+++ b/arch/arm/dts/imx6q.dtsi
@@ -162,7 +162,7 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
-               aips-bus@2000000 { /* AIPS1 */
+               bus@2000000 { /* AIPS1 */
                        spba-bus@2000000 {
                                ecspi5: spi@2018000 {
                                        #address-cells = <1>;

diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi
index 1279cc2338b6fe8b1feb4872775f14f846169b40..f74af6c423e61896a4ea1a7fa05566263a1514be 100644 (file)
--- a/arch/arm/dts/imx6qdl-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-u-boot.dtsi
@@ -13,14 +13,14 @@
                u-boot,dm-spl;
                u-boot,dm-pre-reloc;
 
-               aips-bus@2000000 {
+               bus@2000000 {
                        u-boot,dm-spl;
                        spba-bus@2000000 {
                                u-boot,dm-spl;
                        };
                };
 
-               aips-bus@2100000 {
+               bus@2100000 {
                        u-boot,dm-spl;
                };
        };

diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
index e4daf150881a9e2c9f5d5283e470edd8c586b13a..1cdb498c720f883bf4e7237e639a42abea6be3b7 100644 (file)
--- a/arch/arm/dts/imx6qdl.dtsi
+++ b/arch/arm/dts/imx6qdl.dtsi
@@ -283,7 +283,7 @@
                        status = "disabled";
                };
 
-               aips-bus@2000000 { /* AIPS1 */
+               bus@2000000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -913,7 +913,7 @@
                        };
                };
 
-               aips-bus@2100000 { /* AIPS2 */
+               bus@2100000 { /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi
index 5f51f8e5c1faeee6bfff1f55d94134ea93292688..93b89dc1f53b5b20c1044ceead90f821b112c2fb 100644 (file)
--- a/arch/arm/dts/imx6qp.dtsi
+++ b/arch/arm/dts/imx6qp.dtsi
@@ -18,7 +18,7 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
-               aips-bus@2100000 {
+               bus@2100000 {
                        pre1: pre@21c8000 {
                                compatible = "fsl,imx6qp-pre";
                                reg = <0x021c8000 0x1000>;

diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi
index cc9572ea2860a5b619ce27bce26ed78de0c4c13c..37e341c6c352a45cc5462a175113b12a873d855a 100644 (file)
--- a/arch/arm/dts/imx6sl.dtsi
+++ b/arch/arm/dts/imx6sl.dtsi
@@ -130,7 +130,7 @@
                        interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
                };
 
-               aips1: aips-bus@02000000 {
+               aips1: bus@02000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -751,7 +751,7 @@
                        };
                };
 
-               aips2: aips-bus@02100000 {
+               aips2: bus@02100000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6sll.dtsi b/arch/arm/dts/imx6sll.dtsi
index 349c47a03a25b66750eb5bddb25dab284a192ac5..ebc6d9d2c988a41f20e63fa0068e53a1be9d6cd1 100644 (file)
--- a/arch/arm/dts/imx6sll.dtsi
+++ b/arch/arm/dts/imx6sll.dtsi
@@ -176,7 +176,7 @@
                        arm,data-latency = <4 2 3>;
                };
 
-               aips1: aips-bus@02000000 {
+               aips1: bus@02000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -682,7 +682,7 @@
                        };
                };
 
-               aips2: aips-bus@02100000 {
+               aips2: bus@02100000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6sx.dtsi b/arch/arm/dts/imx6sx.dtsi
index 531a52c1e987e58a5aea405e2504e6dbaa4368e9..8d2d396ad138e2dabd175edc78ad3308b166bc1c 100644 (file)
--- a/arch/arm/dts/imx6sx.dtsi
+++ b/arch/arm/dts/imx6sx.dtsi
@@ -235,7 +235,7 @@
                        status = "disabled";
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -830,7 +830,7 @@
                        };
                };
 
-               aips2: aips-bus@2100000 {
+               aips2: bus@2100000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -1188,7 +1188,7 @@
                        };
                };
 
-               aips3: aips-bus@2200000 {
+               aips3: bus@2200000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi
index 5644b0f34d578f20f2a14f33537eadc17f388ae2..ad9cb37db774e46946d80537e5fc09252201c838 100644 (file)
--- a/arch/arm/dts/imx6ul.dtsi
+++ b/arch/arm/dts/imx6ul.dtsi
@@ -206,7 +206,7 @@
                        status = "disabled";
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -763,7 +763,7 @@
                        };
                };
 
-               aips2: aips-bus@2100000 {
+               aips2: bus@2100000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi
index 22e4a307fa5934b08c6c16052c8f84bd636278e0..f224e20bda9200610aaf488ea25ea5a2d549a44d 100644 (file)
--- a/arch/arm/dts/imx6ull.dtsi
+++ b/arch/arm/dts/imx6ull.dtsi
@@ -44,7 +44,7 @@
 
 / {
        soc {
-               aips3: aips-bus@2200000 {
+               aips3: bus@2200000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi
index 967023fde196fd8351641248c2114a9207eb5dba..483824fc06e651a4d5ef054a8c765a2f4f2f2607 100644 (file)
--- a/arch/arm/dts/imx7s.dtsi
+++ b/arch/arm/dts/imx7s.dtsi
@@ -340,7 +340,7 @@
                              <0x31006000 0x2000>;
                };
 
-               aips1: aips-bus@30000000 {
+               aips1: bus@30000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -647,7 +647,7 @@
                        };
                };
 
-               aips2: aips-bus@30400000 {
+               aips2: bus@30400000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -739,7 +739,7 @@
                        };
                };
 
-               aips3: aips-bus@30800000 {
+               aips3: bus@30800000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi
index 5f69d0fd6e6dc8d13d325452335076a10641bcb0..5ba13dc62bc3233c53383e075873928d055827b8 100644 (file)
--- a/arch/arm/dts/vf.dtsi
+++ b/arch/arm/dts/vf.dtsi
@@ -34,7 +34,7 @@
                compatible = "simple-bus";
                ranges;
 
-               aips0: aips-bus@40000000 {
+               aips0: bus@40000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -158,7 +158,7 @@
                        };
                };
 
-               aips1: aips-bus@40080000 {
+               aips1: bus@40080000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;