ARM: dts: imx: use generic name bus

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

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

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

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 40b95a290bd6b6a5841c2349f6a811f4df7592f7..1123e683025cc29b386065bbc58ccecb3d4f2612 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -75,7 +75,7 @@
                interrupt-parent = <&asic>;
                ranges;
 
-               aips@43f00000 { /* AIPS1 */
+               bus@43f00000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -332,7 +332,7 @@
                        };
                };
 
-               aips@53f00000 { /* AIPS2 */
+               bus@53f00000 { /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 6b62f0745b829b502eaabcf3d7ba9feb5e113e5d..18270ec648fe02b698e6155cc6159f0adf00f1d4 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -63,7 +63,7 @@
                        ranges = <0 0x1fffc000 0x4000>;
                };
 
-               aips@43f00000 { /* AIPS1 */
+               bus@43f00000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -225,7 +225,7 @@
                        };
                };
 
-               aips@53f00000 { /* AIPS2 */
+               bus@53f00000 { /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 9cbdc1a15cda21aca4d277c86fea1496a1acaced..2ebf2c1fa682ec5638e2892445adf72d8d557c5a 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -66,7 +66,7 @@
                        cache-level = <2>;
                };
 
-               aips1: aips@43f00000 {
+               aips1: bus@43f00000 {
                        compatible = "fsl,aips", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -199,7 +199,7 @@
                        };
                };
 
-               aips2: aips@53f00000 {
+               aips2: bus@53f00000 {
                        compatible = "fsl,aips", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 0bfe7c91d0eb291a395f355ba461048c13c9fd6e..d325658901c518010bdb554f03641e929f18ba9e 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -101,7 +101,7 @@
                interrupt-parent = <&tzic>;
                ranges;
 
-               aips@50000000 { /* AIPS1 */
+               bus@50000000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -389,7 +389,7 @@
                        };
                };
 
-               aips@60000000 { /* AIPS2 */
+               bus@60000000 {  /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index dea86b98e9c39af6a926558983b88c27b2b48b22..6f608d9d9016b6f1687bace0cecb1cc89f78ede2 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -158,7 +158,7 @@
                        };
                };
 
-               aips@70000000 { /* AIPS1 */
+               bus@70000000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -440,7 +440,7 @@
                        };
                };
 
-               aips@80000000 { /* AIPS2 */
+               bus@80000000 {  /* AIPS2 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index ed341cfd9d097a4298f219be355c67c8fc02328e..8536f59f59e6eb2d51c064f7600e071489c6ba66 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/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/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 008312ee0c3192f65429ede54b00d4c8c2096a6f..4b3a128d9260727b2ad6bf46be9eb89533e320a5 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -85,7 +85,7 @@
                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        iomuxc: iomuxc@20e0000 {
                                compatible = "fsl,imx6dl-iomuxc";
                        };
@@ -101,7 +101,7 @@
                        };
                };
 
-               aips2: aips-bus@2100000 {
+               aips2: bus@2100000 {
                        i2c4: i2c@21f8000 {
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 9d3be1cc6b64876a45725c8fae970c7a46156800..0fad13f9d3364dce26f35daffa712290941dc077 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -164,7 +164,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/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index e6b4b8525f989399dd05273fbcb8503e7829cd56..bf9d20f210608e28e6bc1af64244449b56450258 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -294,7 +294,7 @@
                        status = "disabled";
                };
 
-               aips-bus@2000000 { /* AIPS1 */
+               bus@2000000 { /* AIPS1 */
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -935,7 +935,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/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi
index 5f51f8e5c1faeee6bfff1f55d94134ea93292688..93b89dc1f53b5b20c1044ceead90f821b112c2fb 100644 (file)
--- a/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/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/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 59c54e6ad09aabc0dc9d62f0e940f3af9241a155..5b26c8d756262d067178d37623121d73a9cdc574 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -143,7 +143,7 @@
                        arm,data-latency = <4 2 3>;
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -786,7 +786,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/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index a1bc5bb3175680ae33d76468305f9492f6f810c8..797f850492fe8277424b8c8bdad50821e0ad1848 100644 (file)
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -144,7 +144,7 @@
                        arm,data-latency = <4 2 3>;
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -663,7 +663,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/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 59bad60a47dc16ec6f2100e9ca1c16c57fd3095b..98de781b8082e756b061a29c1d3da565adce26cd 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/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/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d9fdca12819b21c022443bb325d3e8e9ba1e3469..beb82d357f37c50a213a5b03aaae20d2ae4408a0 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -204,7 +204,7 @@
                        status = "disabled";
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -771,7 +771,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/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index b7e67d1213229ded70138c300305afafbba70d5d..fcde7f77ae423225ade8928271a824786ed531ec 100644 (file)
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -51,7 +51,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/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 568d7a984aa68c65faf94d89794ba8656b2c5dfd..f959f69b067767799d95b2fea27bdcabcac37e7c 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -315,7 +315,7 @@
                              <0x31006000 0x2000>;
                };
 
-               aips1: aips-bus@30000000 {
+               aips1: bus@30000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -663,7 +663,7 @@
                        };
                };
 
-               aips2: aips-bus@30400000 {
+               aips2: bus@30400000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -803,7 +803,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/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index b0ec475017ad90c9d048211ffd50ee0b9aae7cb3..0c0dd442300a38509abca960a4534f26f0e5f200 100644 (file)
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -23,7 +23,7 @@
        };
 
        soc {
-               aips-bus@40000000 {
+               bus@40000000 {
 
                        intc: interrupt-controller@40003000 {
                                compatible = "arm,cortex-a9-gic";
@@ -43,7 +43,7 @@
                        };
                };
 
-               aips-bus@40080000 {
+               bus@40080000 {
                        pmu@40089000 {
                                compatible = "arm,cortex-a5-pmu";
                                interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 028e0ec30e0c05d0ccffcb4c2d53deebc4cfc6e4..2d547e7b21ad5e65fee13e5b22f9bc8650b094fc 100644 (file)
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -59,7 +59,7 @@
                interrupt-parent = <&mscm_ir>;
                ranges;
 
-               aips0: aips-bus@40000000 {
+               aips0: bus@40000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -471,7 +471,7 @@
                        };
                };
 
-               aips1: aips-bus@40080000 {
+               aips1: bus@40080000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;