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

ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus"

The compatible string "simple-bus" is well defined in ePAPR, while
I see no documentation for the "arm,amba-bus" arnywhere in ePAPR or
Documentation/devicetree/.

DT is also used by other projects than Linux kernel. It is not a
good idea to rely on such an unofficial binding.

This commit
- replaces "arm,amba-bus" with "simple-bus"
- drops "arm,amba-bus" where it is used along with "simple-bus"

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

authored by

Masahiro Yamada and committed by
Olof Johansson
2ef7d5f3 301c6e0b

+29 -29
+1 -1
arch/arm/boot/dts/axm55xx.dtsi
··· 107 107 }; 108 108 109 109 amba { 110 - compatible = "arm,amba-bus"; 110 + compatible = "simple-bus"; 111 111 #address-cells = <2>; 112 112 #size-cells = <2>; 113 113 ranges;
+1 -1
arch/arm/boot/dts/exynos3250.dtsi
··· 368 368 }; 369 369 370 370 amba { 371 - compatible = "arm,amba-bus"; 371 + compatible = "simple-bus"; 372 372 #address-cells = <1>; 373 373 #size-cells = <1>; 374 374 ranges;
+1 -1
arch/arm/boot/dts/exynos4.dtsi
··· 653 653 amba { 654 654 #address-cells = <1>; 655 655 #size-cells = <1>; 656 - compatible = "arm,amba-bus"; 656 + compatible = "simple-bus"; 657 657 interrupt-parent = <&gic>; 658 658 ranges; 659 659
+1 -1
arch/arm/boot/dts/exynos4415.dtsi
··· 380 380 }; 381 381 382 382 amba { 383 - compatible = "arm,amba-bus"; 383 + compatible = "simple-bus"; 384 384 #address-cells = <1>; 385 385 #size-cells = <1>; 386 386 interrupt-parent = <&gic>;
+1 -1
arch/arm/boot/dts/exynos5250.dtsi
··· 674 674 amba { 675 675 #address-cells = <1>; 676 676 #size-cells = <1>; 677 - compatible = "arm,amba-bus"; 677 + compatible = "simple-bus"; 678 678 interrupt-parent = <&gic>; 679 679 ranges; 680 680
+1 -1
arch/arm/boot/dts/exynos5420.dtsi
··· 375 375 amba { 376 376 #address-cells = <1>; 377 377 #size-cells = <1>; 378 - compatible = "arm,amba-bus"; 378 + compatible = "simple-bus"; 379 379 interrupt-parent = <&gic>; 380 380 ranges; 381 381
+1 -1
arch/arm/boot/dts/exynos5440.dtsi
··· 200 200 amba { 201 201 #address-cells = <1>; 202 202 #size-cells = <1>; 203 - compatible = "arm,amba-bus"; 203 + compatible = "simple-bus"; 204 204 interrupt-parent = <&gic>; 205 205 ranges; 206 206 };
+1 -1
arch/arm/boot/dts/hi3620.dtsi
··· 68 68 69 69 #address-cells = <1>; 70 70 #size-cells = <1>; 71 - compatible = "arm,amba-bus"; 71 + compatible = "simple-bus"; 72 72 interrupt-parent = <&gic>; 73 73 ranges = <0 0xfc000000 0x2000000>; 74 74
+1 -1
arch/arm/boot/dts/hip01.dtsi
··· 43 43 amba { 44 44 #address-cells = <1>; 45 45 #size-cells = <1>; 46 - compatible = "arm,amba-bus"; 46 + compatible = "simple-bus"; 47 47 ranges; 48 48 49 49 uart0: uart@10001000 {
+1 -1
arch/arm/boot/dts/hisi-x5hd2.dtsi
··· 34 34 amba { 35 35 #address-cells = <1>; 36 36 #size-cells = <1>; 37 - compatible = "arm,amba-bus"; 37 + compatible = "simple-bus"; 38 38 ranges; 39 39 40 40 timer0: timer@00002000 {
+1 -1
arch/arm/boot/dts/integrator.dtsi
··· 57 57 }; 58 58 59 59 fpga { 60 - compatible = "arm,amba-bus", "simple-bus"; 60 + compatible = "simple-bus"; 61 61 #address-cells = <1>; 62 62 #size-cells = <1>; 63 63 ranges;
+1 -1
arch/arm/boot/dts/qcom-apq8064.dtsi
··· 722 722 }; 723 723 724 724 amba { 725 - compatible = "arm,amba-bus"; 725 + compatible = "simple-bus"; 726 726 #address-cells = <1>; 727 727 #size-cells = <1>; 728 728 ranges;
+1 -1
arch/arm/boot/dts/qcom-msm8660.dtsi
··· 187 187 }; 188 188 189 189 amba { 190 - compatible = "arm,amba-bus"; 190 + compatible = "simple-bus"; 191 191 #address-cells = <1>; 192 192 #size-cells = <1>; 193 193 ranges;
+1 -1
arch/arm/boot/dts/qcom-msm8960.dtsi
··· 251 251 }; 252 252 253 253 amba { 254 - compatible = "arm,amba-bus"; 254 + compatible = "simple-bus"; 255 255 #address-cells = <1>; 256 256 #size-cells = <1>; 257 257 ranges;
+1 -1
arch/arm/boot/dts/rk3036.dtsi
··· 95 95 }; 96 96 97 97 amba { 98 - compatible = "arm,amba-bus"; 98 + compatible = "simple-bus"; 99 99 #address-cells = <1>; 100 100 #size-cells = <1>; 101 101 ranges;
+1 -1
arch/arm/boot/dts/rk3228.dtsi
··· 96 96 }; 97 97 98 98 amba { 99 - compatible = "arm,amba-bus"; 99 + compatible = "simple-bus"; 100 100 #address-cells = <1>; 101 101 #size-cells = <1>; 102 102 ranges;
+1 -1
arch/arm/boot/dts/rk3288.dtsi
··· 134 134 }; 135 135 136 136 amba { 137 - compatible = "arm,amba-bus"; 137 + compatible = "simple-bus"; 138 138 #address-cells = <1>; 139 139 #size-cells = <1>; 140 140 ranges;
+1 -1
arch/arm/boot/dts/rk3xxx.dtsi
··· 67 67 }; 68 68 69 69 amba { 70 - compatible = "arm,amba-bus"; 70 + compatible = "simple-bus"; 71 71 #address-cells = <1>; 72 72 #size-cells = <1>; 73 73 ranges;
+1 -1
arch/arm/boot/dts/s5pv210.dtsi
··· 130 130 amba { 131 131 #address-cells = <1>; 132 132 #size-cells = <1>; 133 - compatible = "arm,amba-bus"; 133 + compatible = "simple-bus"; 134 134 ranges; 135 135 136 136 pdma0: dma@e0900000 {
+1 -1
arch/arm/boot/dts/socfpga.dtsi
··· 69 69 ranges; 70 70 71 71 amba { 72 - compatible = "arm,amba-bus"; 72 + compatible = "simple-bus"; 73 73 #address-cells = <1>; 74 74 #size-cells = <1>; 75 75 ranges;
+1 -1
arch/arm/boot/dts/socfpga_arria10.dtsi
··· 63 63 ranges; 64 64 65 65 amba { 66 - compatible = "arm,amba-bus"; 66 + compatible = "simple-bus"; 67 67 #address-cells = <1>; 68 68 #size-cells = <1>; 69 69 ranges;
+1 -1
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
··· 721 721 }; 722 722 723 723 amba { 724 - compatible = "arm,amba-bus"; 724 + compatible = "simple-bus"; 725 725 #address-cells = <1>; 726 726 #size-cells = <1>; 727 727 ranges;
+1 -1
arch/arm/boot/dts/ste-u300.dts
··· 384 384 }; 385 385 386 386 amba { 387 - compatible = "arm,amba-bus"; 387 + compatible = "simple-bus"; 388 388 #address-cells = <1>; 389 389 #size-cells = <1>; 390 390 ranges;
+1 -1
arch/arm/boot/dts/versatile-ab.dts
··· 148 148 }; 149 149 150 150 amba { 151 - compatible = "arm,amba-bus"; 151 + compatible = "simple-bus"; 152 152 #address-cells = <1>; 153 153 #size-cells = <1>; 154 154 ranges;
+1 -1
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
··· 66 66 }; 67 67 68 68 iofpga@3,00000000 { 69 - compatible = "arm,amba-bus", "simple-bus"; 69 + compatible = "simple-bus"; 70 70 #address-cells = <1>; 71 71 #size-cells = <1>; 72 72 ranges = <0 3 0 0x200000>;
+1 -1
arch/arm/boot/dts/vexpress-v2m.dtsi
··· 65 65 }; 66 66 67 67 iofpga@7,00000000 { 68 - compatible = "arm,amba-bus", "simple-bus"; 68 + compatible = "simple-bus"; 69 69 #address-cells = <1>; 70 70 #size-cells = <1>; 71 71 ranges = <0 7 0 0x20000>;
+1 -1
arch/arm64/boot/dts/arm/foundation-v8.dtsi
··· 184 184 }; 185 185 186 186 iofpga@3,00000000 { 187 - compatible = "arm,amba-bus", "simple-bus"; 187 + compatible = "simple-bus"; 188 188 #address-cells = <1>; 189 189 #size-cells = <1>; 190 190 ranges = <0 3 0 0x200000>;
+1 -1
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
··· 139 139 }; 140 140 141 141 iofpga@3,00000000 { 142 - compatible = "arm,amba-bus", "simple-bus"; 142 + compatible = "simple-bus"; 143 143 #address-cells = <1>; 144 144 #size-cells = <1>; 145 145 ranges = <0 3 0 0x200000>;
+1 -1
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
··· 55 55 }; 56 56 57 57 iofpga@3,00000000 { 58 - compatible = "arm,amba-bus", "simple-bus"; 58 + compatible = "simple-bus"; 59 59 #address-cells = <1>; 60 60 #size-cells = <1>; 61 61 ranges = <0 3 0 0x200000>;