Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Peng Fan and committed by
Shawn Guo
c0157bdc 18432e86

+35 -35
+2 -2
arch/arm/boot/dts/imx25.dtsi
··· 75 75 interrupt-parent = <&asic>; 76 76 ranges; 77 77 78 - aips@43f00000 { /* AIPS1 */ 78 + bus@43f00000 { /* AIPS1 */ 79 79 compatible = "fsl,aips-bus", "simple-bus"; 80 80 #address-cells = <1>; 81 81 #size-cells = <1>; ··· 332 332 }; 333 333 }; 334 334 335 - aips@53f00000 { /* AIPS2 */ 335 + bus@53f00000 { /* AIPS2 */ 336 336 compatible = "fsl,aips-bus", "simple-bus"; 337 337 #address-cells = <1>; 338 338 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx31.dtsi
··· 63 63 ranges = <0 0x1fffc000 0x4000>; 64 64 }; 65 65 66 - aips@43f00000 { /* AIPS1 */ 66 + bus@43f00000 { /* AIPS1 */ 67 67 compatible = "fsl,aips-bus", "simple-bus"; 68 68 #address-cells = <1>; 69 69 #size-cells = <1>; ··· 225 225 }; 226 226 }; 227 227 228 - aips@53f00000 { /* AIPS2 */ 228 + bus@53f00000 { /* AIPS2 */ 229 229 compatible = "fsl,aips-bus", "simple-bus"; 230 230 #address-cells = <1>; 231 231 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx35.dtsi
··· 66 66 cache-level = <2>; 67 67 }; 68 68 69 - aips1: aips@43f00000 { 69 + aips1: bus@43f00000 { 70 70 compatible = "fsl,aips", "simple-bus"; 71 71 #address-cells = <1>; 72 72 #size-cells = <1>; ··· 199 199 }; 200 200 }; 201 201 202 - aips2: aips@53f00000 { 202 + aips2: bus@53f00000 { 203 203 compatible = "fsl,aips", "simple-bus"; 204 204 #address-cells = <1>; 205 205 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx50.dtsi
··· 101 101 interrupt-parent = <&tzic>; 102 102 ranges; 103 103 104 - aips@50000000 { /* AIPS1 */ 104 + bus@50000000 { /* AIPS1 */ 105 105 compatible = "fsl,aips-bus", "simple-bus"; 106 106 #address-cells = <1>; 107 107 #size-cells = <1>; ··· 389 389 }; 390 390 }; 391 391 392 - aips@60000000 { /* AIPS2 */ 392 + bus@60000000 { /* AIPS2 */ 393 393 compatible = "fsl,aips-bus", "simple-bus"; 394 394 #address-cells = <1>; 395 395 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx51.dtsi
··· 158 158 }; 159 159 }; 160 160 161 - aips@70000000 { /* AIPS1 */ 161 + bus@70000000 { /* AIPS1 */ 162 162 compatible = "fsl,aips-bus", "simple-bus"; 163 163 #address-cells = <1>; 164 164 #size-cells = <1>; ··· 440 440 }; 441 441 }; 442 442 443 - aips@80000000 { /* AIPS2 */ 443 + bus@80000000 { /* AIPS2 */ 444 444 compatible = "fsl,aips-bus", "simple-bus"; 445 445 #address-cells = <1>; 446 446 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx53.dtsi
··· 222 222 clock-names = "core_clk", "mem_iface_clk"; 223 223 }; 224 224 225 - aips@50000000 { /* AIPS1 */ 225 + bus@50000000 { /* AIPS1 */ 226 226 compatible = "fsl,aips-bus", "simple-bus"; 227 227 #address-cells = <1>; 228 228 #size-cells = <1>; ··· 654 654 }; 655 655 }; 656 656 657 - aips@60000000 { /* AIPS2 */ 657 + bus@60000000 { /* AIPS2 */ 658 658 compatible = "fsl,aips-bus", "simple-bus"; 659 659 #address-cells = <1>; 660 660 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx6dl.dtsi
··· 85 85 clocks = <&clks IMX6QDL_CLK_OCRAM>; 86 86 }; 87 87 88 - aips1: aips-bus@2000000 { 88 + aips1: bus@2000000 { 89 89 iomuxc: iomuxc@20e0000 { 90 90 compatible = "fsl,imx6dl-iomuxc"; 91 91 }; ··· 101 101 }; 102 102 }; 103 103 104 - aips2: aips-bus@2100000 { 104 + aips2: bus@2100000 { 105 105 i2c4: i2c@21f8000 { 106 106 #address-cells = <1>; 107 107 #size-cells = <0>;
+1 -1
arch/arm/boot/dts/imx6q.dtsi
··· 164 164 clocks = <&clks IMX6QDL_CLK_OCRAM>; 165 165 }; 166 166 167 - aips-bus@2000000 { /* AIPS1 */ 167 + bus@2000000 { /* AIPS1 */ 168 168 spba-bus@2000000 { 169 169 ecspi5: spi@2018000 { 170 170 #address-cells = <1>;
+2 -2
arch/arm/boot/dts/imx6qdl.dtsi
··· 294 294 status = "disabled"; 295 295 }; 296 296 297 - aips-bus@2000000 { /* AIPS1 */ 297 + bus@2000000 { /* AIPS1 */ 298 298 compatible = "fsl,aips-bus", "simple-bus"; 299 299 #address-cells = <1>; 300 300 #size-cells = <1>; ··· 935 935 }; 936 936 }; 937 937 938 - aips-bus@2100000 { /* AIPS2 */ 938 + bus@2100000 { /* AIPS2 */ 939 939 compatible = "fsl,aips-bus", "simple-bus"; 940 940 #address-cells = <1>; 941 941 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx6qp.dtsi
··· 18 18 clocks = <&clks IMX6QDL_CLK_OCRAM>; 19 19 }; 20 20 21 - aips-bus@2100000 { 21 + bus@2100000 { 22 22 pre1: pre@21c8000 { 23 23 compatible = "fsl,imx6qp-pre"; 24 24 reg = <0x021c8000 0x1000>;
+2 -2
arch/arm/boot/dts/imx6sl.dtsi
··· 143 143 arm,data-latency = <4 2 3>; 144 144 }; 145 145 146 - aips1: aips-bus@2000000 { 146 + aips1: bus@2000000 { 147 147 compatible = "fsl,aips-bus", "simple-bus"; 148 148 #address-cells = <1>; 149 149 #size-cells = <1>; ··· 786 786 }; 787 787 }; 788 788 789 - aips2: aips-bus@2100000 { 789 + aips2: bus@2100000 { 790 790 compatible = "fsl,aips-bus", "simple-bus"; 791 791 #address-cells = <1>; 792 792 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx6sll.dtsi
··· 144 144 arm,data-latency = <4 2 3>; 145 145 }; 146 146 147 - aips1: aips-bus@2000000 { 147 + aips1: bus@2000000 { 148 148 compatible = "fsl,aips-bus", "simple-bus"; 149 149 #address-cells = <1>; 150 150 #size-cells = <1>; ··· 663 663 }; 664 664 }; 665 665 666 - aips2: aips-bus@2100000 { 666 + aips2: bus@2100000 { 667 667 compatible = "fsl,aips-bus", "simple-bus"; 668 668 #address-cells = <1>; 669 669 #size-cells = <1>;
+3 -3
arch/arm/boot/dts/imx6sx.dtsi
··· 235 235 status = "disabled"; 236 236 }; 237 237 238 - aips1: aips-bus@2000000 { 238 + aips1: bus@2000000 { 239 239 compatible = "fsl,aips-bus", "simple-bus"; 240 240 #address-cells = <1>; 241 241 #size-cells = <1>; ··· 830 830 }; 831 831 }; 832 832 833 - aips2: aips-bus@2100000 { 833 + aips2: bus@2100000 { 834 834 compatible = "fsl,aips-bus", "simple-bus"; 835 835 #address-cells = <1>; 836 836 #size-cells = <1>; ··· 1188 1188 }; 1189 1189 }; 1190 1190 1191 - aips3: aips-bus@2200000 { 1191 + aips3: bus@2200000 { 1192 1192 compatible = "fsl,aips-bus", "simple-bus"; 1193 1193 #address-cells = <1>; 1194 1194 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/imx6ul.dtsi
··· 204 204 status = "disabled"; 205 205 }; 206 206 207 - aips1: aips-bus@2000000 { 207 + aips1: bus@2000000 { 208 208 compatible = "fsl,aips-bus", "simple-bus"; 209 209 #address-cells = <1>; 210 210 #size-cells = <1>; ··· 771 771 }; 772 772 }; 773 773 774 - aips2: aips-bus@2100000 { 774 + aips2: bus@2100000 { 775 775 compatible = "fsl,aips-bus", "simple-bus"; 776 776 #address-cells = <1>; 777 777 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx6ull.dtsi
··· 51 51 52 52 / { 53 53 soc { 54 - aips3: aips-bus@2200000 { 54 + aips3: bus@2200000 { 55 55 compatible = "fsl,aips-bus", "simple-bus"; 56 56 #address-cells = <1>; 57 57 #size-cells = <1>;
+3 -3
arch/arm/boot/dts/imx7s.dtsi
··· 315 315 <0x31006000 0x2000>; 316 316 }; 317 317 318 - aips1: aips-bus@30000000 { 318 + aips1: bus@30000000 { 319 319 compatible = "fsl,aips-bus", "simple-bus"; 320 320 #address-cells = <1>; 321 321 #size-cells = <1>; ··· 663 663 }; 664 664 }; 665 665 666 - aips2: aips-bus@30400000 { 666 + aips2: bus@30400000 { 667 667 compatible = "fsl,aips-bus", "simple-bus"; 668 668 #address-cells = <1>; 669 669 #size-cells = <1>; ··· 803 803 }; 804 804 }; 805 805 806 - aips3: aips-bus@30800000 { 806 + aips3: bus@30800000 { 807 807 compatible = "fsl,aips-bus", "simple-bus"; 808 808 #address-cells = <1>; 809 809 #size-cells = <1>;
+2 -2
arch/arm/boot/dts/vf500.dtsi
··· 23 23 }; 24 24 25 25 soc { 26 - aips-bus@40000000 { 26 + bus@40000000 { 27 27 28 28 intc: interrupt-controller@40003000 { 29 29 compatible = "arm,cortex-a9-gic"; ··· 43 43 }; 44 44 }; 45 45 46 - aips-bus@40080000 { 46 + bus@40080000 { 47 47 pmu@40089000 { 48 48 compatible = "arm,cortex-a5-pmu"; 49 49 interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
+2 -2
arch/arm/boot/dts/vfxxx.dtsi
··· 59 59 interrupt-parent = <&mscm_ir>; 60 60 ranges; 61 61 62 - aips0: aips-bus@40000000 { 62 + aips0: bus@40000000 { 63 63 compatible = "fsl,aips-bus", "simple-bus"; 64 64 #address-cells = <1>; 65 65 #size-cells = <1>; ··· 471 471 }; 472 472 }; 473 473 474 - aips1: aips-bus@40080000 { 474 + aips1: bus@40080000 { 475 475 compatible = "fsl,aips-bus", "simple-bus"; 476 476 #address-cells = <1>; 477 477 #size-cells = <1>;