aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-03-08 23:26:45 -0500
committerOlof Johansson <olof@lixom.net>2016-03-12 20:40:34 -0500
commit2ef7d5f342c12c02e68da225c0715b0c9cefce70 (patch)
tree0a74c93e030889210447a7905f08fdc9fa2902e7
parent301c6e0b16ef1c45d3a269f6d854d88ca97a950c (diff)
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>
Diffstat
-rw-r--r--arch/arm/boot/dts/axm55xx.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos3250.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4415.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5420.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5440.dtsi2
-rw-r--r--arch/arm/boot/dts/hi3620.dtsi2
-rw-r--r--arch/arm/boot/dts/hip01.dtsi2
-rw-r--r--arch/arm/boot/dts/hisi-x5hd2.dtsi2
-rw-r--r--arch/arm/boot/dts/integrator.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom-apq8064.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom-msm8660.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom-msm8960.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3036.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3228.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3288.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3xxx.dtsi2
-rw-r--r--arch/arm/boot/dts/s5pv210.dtsi2
-rw-r--r--arch/arm/boot/dts/socfpga.dtsi2
-rw-r--r--arch/arm/boot/dts/socfpga_arria10.dtsi2
-rw-r--r--arch/arm/boot/dts/ste-nomadik-stn8815.dtsi2
-rw-r--r--arch/arm/boot/dts/ste-u300.dts2
-rw-r--r--arch/arm/boot/dts/versatile-ab.dts2
-rw-r--r--arch/arm/boot/dts/vexpress-v2m-rs1.dtsi2
-rw-r--r--arch/arm/boot/dts/vexpress-v2m.dtsi2
-rw-r--r--arch/arm64/boot/dts/arm/foundation-v8.dtsi2
-rw-r--r--arch/arm64/boot/dts/arm/juno-motherboard.dtsi2
-rw-r--r--arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi2
29 files changed, 29 insertions, 29 deletions
diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
index ea288f0a1d39..a9d6d593fc8a 100644
--- a/arch/arm/boot/dts/axm55xx.dtsi
+++ b/arch/arm/boot/dts/axm55xx.dtsi
@@ -107,7 +107,7 @@
107 }; 107 };
108 108
109 amba { 109 amba {
110 compatible = "arm,amba-bus"; 110 compatible = "simple-bus";
111 #address-cells = <2>; 111 #address-cells = <2>;
112 #size-cells = <2>; 112 #size-cells = <2>;
113 ranges; 113 ranges;
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index d9c221517935..137f9015d4e8 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -368,7 +368,7 @@
368 }; 368 };
369 369
370 amba { 370 amba {
371 compatible = "arm,amba-bus"; 371 compatible = "simple-bus";
372 #address-cells = <1>; 372 #address-cells = <1>;
373 #size-cells = <1>; 373 #size-cells = <1>;
374 ranges; 374 ranges;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 5456094d2f45..c679b3cc3c48 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -653,7 +653,7 @@
653 amba { 653 amba {
654 #address-cells = <1>; 654 #address-cells = <1>;
655 #size-cells = <1>; 655 #size-cells = <1>;
656 compatible = "arm,amba-bus"; 656 compatible = "simple-bus";
657 interrupt-parent = <&gic>; 657 interrupt-parent = <&gic>;
658 ranges; 658 ranges;
659 659
diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
index ad764842fff5..28b04b6795c9 100644
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -380,7 +380,7 @@
380 }; 380 };
381 381
382 amba { 382 amba {
383 compatible = "arm,amba-bus"; 383 compatible = "simple-bus";
384 #address-cells = <1>; 384 #address-cells = <1>;
385 #size-cells = <1>; 385 #size-cells = <1>;
386 interrupt-parent = <&gic>; 386 interrupt-parent = <&gic>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 234403422c6f..e653ae04015a 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -674,7 +674,7 @@
674 amba { 674 amba {
675 #address-cells = <1>; 675 #address-cells = <1>;
676 #size-cells = <1>; 676 #size-cells = <1>;
677 compatible = "arm,amba-bus"; 677 compatible = "simple-bus";
678 interrupt-parent = <&gic>; 678 interrupt-parent = <&gic>;
679 ranges; 679 ranges;
680 680
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index bb559d0cd956..7b99cb58d82d 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -375,7 +375,7 @@
375 amba { 375 amba {
376 #address-cells = <1>; 376 #address-cells = <1>;
377 #size-cells = <1>; 377 #size-cells = <1>;
378 compatible = "arm,amba-bus"; 378 compatible = "simple-bus";
379 interrupt-parent = <&gic>; 379 interrupt-parent = <&gic>;
380 ranges; 380 ranges;
381 381
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index f18b51f2eeaa..b9342ec5b9cf 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -200,7 +200,7 @@
200 amba { 200 amba {
201 #address-cells = <1>; 201 #address-cells = <1>;
202 #size-cells = <1>; 202 #size-cells = <1>;
203 compatible = "arm,amba-bus"; 203 compatible = "simple-bus";
204 interrupt-parent = <&gic>; 204 interrupt-parent = <&gic>;
205 ranges; 205 ranges;
206 }; 206 };
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index 6cbb62e5c6a9..c85d07e6db61 100644
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -68,7 +68,7 @@
68 68
69 #address-cells = <1>; 69 #address-cells = <1>;
70 #size-cells = <1>; 70 #size-cells = <1>;
71 compatible = "arm,amba-bus"; 71 compatible = "simple-bus";
72 interrupt-parent = <&gic>; 72 interrupt-parent = <&gic>;
73 ranges = <0 0xfc000000 0x2000000>; 73 ranges = <0 0xfc000000 0x2000000>;
74 74
diff --git a/arch/arm/boot/dts/hip01.dtsi b/arch/arm/boot/dts/hip01.dtsi
index 33130f8461c3..4e9562f806a2 100644
--- a/arch/arm/boot/dts/hip01.dtsi
+++ b/arch/arm/boot/dts/hip01.dtsi
@@ -43,7 +43,7 @@
43 amba { 43 amba {
44 #address-cells = <1>; 44 #address-cells = <1>;
45 #size-cells = <1>; 45 #size-cells = <1>;
46 compatible = "arm,amba-bus"; 46 compatible = "simple-bus";
47 ranges; 47 ranges;
48 48
49 uart0: uart@10001000 { 49 uart0: uart@10001000 {
diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi
index c52722b14e4a..fdcc23d203e5 100644
--- a/arch/arm/boot/dts/hisi-x5hd2.dtsi
+++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi
@@ -34,7 +34,7 @@
34 amba { 34 amba {
35 #address-cells = <1>; 35 #address-cells = <1>;
36 #size-cells = <1>; 36 #size-cells = <1>;
37 compatible = "arm,amba-bus"; 37 compatible = "simple-bus";
38 ranges; 38 ranges;
39 39
40 timer0: timer@00002000 { 40 timer0: timer@00002000 {
diff --git a/arch/arm/boot/dts/integrator.dtsi b/arch/arm/boot/dts/integrator.dtsi
index 3807d4f46ef7..b82f0e6d9a63 100644
--- a/arch/arm/boot/dts/integrator.dtsi
+++ b/arch/arm/boot/dts/integrator.dtsi
@@ -57,7 +57,7 @@
57 }; 57 };
58 58
59 fpga { 59 fpga {
60 compatible = "arm,amba-bus", "simple-bus"; 60 compatible = "simple-bus";
61 #address-cells = <1>; 61 #address-cells = <1>;
62 #size-cells = <1>; 62 #size-cells = <1>;
63 ranges; 63 ranges;
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 609123ead90e..65d0e8d98259 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -722,7 +722,7 @@
722 }; 722 };
723 723
724 amba { 724 amba {
725 compatible = "arm,amba-bus"; 725 compatible = "simple-bus";
726 #address-cells = <1>; 726 #address-cells = <1>;
727 #size-cells = <1>; 727 #size-cells = <1>;
728 ranges; 728 ranges;
diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index a4b184db21d0..cd214030b84a 100644
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -187,7 +187,7 @@
187 }; 187 };
188 188
189 amba { 189 amba {
190 compatible = "arm,amba-bus"; 190 compatible = "simple-bus";
191 #address-cells = <1>; 191 #address-cells = <1>;
192 #size-cells = <1>; 192 #size-cells = <1>;
193 ranges; 193 ranges;
diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index 51a40d84145c..da05e28a81a7 100644
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -251,7 +251,7 @@
251 }; 251 };
252 252
253 amba { 253 amba {
254 compatible = "arm,amba-bus"; 254 compatible = "simple-bus";
255 #address-cells = <1>; 255 #address-cells = <1>;
256 #size-cells = <1>; 256 #size-cells = <1>;
257 ranges; 257 ranges;
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 3864fa142df0..597fdc4caff9 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -95,7 +95,7 @@
95 }; 95 };
96 96
97 amba { 97 amba {
98 compatible = "arm,amba-bus"; 98 compatible = "simple-bus";
99 #address-cells = <1>; 99 #address-cells = <1>;
100 #size-cells = <1>; 100 #size-cells = <1>;
101 ranges; 101 ranges;
diff --git a/arch/arm/boot/dts/rk3228.dtsi b/arch/arm/boot/dts/rk3228.dtsi
index 119ff12ab440..4dae42a01509 100644
--- a/arch/arm/boot/dts/rk3228.dtsi
+++ b/arch/arm/boot/dts/rk3228.dtsi
@@ -96,7 +96,7 @@
96 }; 96 };
97 97
98 amba { 98 amba {
99 compatible = "arm,amba-bus"; 99 compatible = "simple-bus";
100 #address-cells = <1>; 100 #address-cells = <1>;
101 #size-cells = <1>; 101 #size-cells = <1>;
102 ranges; 102 ranges;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 0934b6abcaab..31f7e20ef418 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -134,7 +134,7 @@
134 }; 134 };
135 135
136 amba { 136 amba {
137 compatible = "arm,amba-bus"; 137 compatible = "simple-bus";
138 #address-cells = <1>; 138 #address-cells = <1>;
139 #size-cells = <1>; 139 #size-cells = <1>;
140 ranges; 140 ranges;
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index f1581f9d050f..99bbcc2c9b89 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -67,7 +67,7 @@
67 }; 67 };
68 68
69 amba { 69 amba {
70 compatible = "arm,amba-bus"; 70 compatible = "simple-bus";
71 #address-cells = <1>; 71 #address-cells = <1>;
72 #size-cells = <1>; 72 #size-cells = <1>;
73 ranges; 73 ranges;
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 8344a0ee2b86..ffc36bd24d2f 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -130,7 +130,7 @@
130 amba { 130 amba {
131 #address-cells = <1>; 131 #address-cells = <1>;
132 #size-cells = <1>; 132 #size-cells = <1>;
133 compatible = "arm,amba-bus"; 133 compatible = "simple-bus";
134 ranges; 134 ranges;
135 135
136 pdma0: dma@e0900000 { 136 pdma0: dma@e0900000 {
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 3ed4abdaaa9c..ece116911b58 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -69,7 +69,7 @@
69 ranges; 69 ranges;
70 70
71 amba { 71 amba {
72 compatible = "arm,amba-bus"; 72 compatible = "simple-bus";
73 #address-cells = <1>; 73 #address-cells = <1>;
74 #size-cells = <1>; 74 #size-cells = <1>;
75 ranges; 75 ranges;
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index cce9e50acf68..1c5e139e4d05 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -63,7 +63,7 @@
63 ranges; 63 ranges;
64 64
65 amba { 65 amba {
66 compatible = "arm,amba-bus"; 66 compatible = "simple-bus";
67 #address-cells = <1>; 67 #address-cells = <1>;
68 #size-cells = <1>; 68 #size-cells = <1>;
69 ranges; 69 ranges;
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 27a333eb8987..e2be53343064 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -721,7 +721,7 @@
721 }; 721 };
722 722
723 amba { 723 amba {
724 compatible = "arm,amba-bus"; 724 compatible = "simple-bus";
725 #address-cells = <1>; 725 #address-cells = <1>;
726 #size-cells = <1>; 726 #size-cells = <1>;
727 ranges; 727 ranges;
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 9c73ac2842ad..2f5107ffeef0 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -384,7 +384,7 @@
384 }; 384 };
385 385
386 amba { 386 amba {
387 compatible = "arm,amba-bus"; 387 compatible = "simple-bus";
388 #address-cells = <1>; 388 #address-cells = <1>;
389 #size-cells = <1>; 389 #size-cells = <1>;
390 ranges; 390 ranges;
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index 6fd7efbead34..d23320af5ea7 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -148,7 +148,7 @@
148 }; 148 };
149 149
150 amba { 150 amba {
151 compatible = "arm,amba-bus"; 151 compatible = "simple-bus";
152 #address-cells = <1>; 152 #address-cells = <1>;
153 #size-cells = <1>; 153 #size-cells = <1>;
154 ranges; 154 ranges;
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index 21b02874bea3..7a556b92e55c 100644
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -66,7 +66,7 @@
66 }; 66 };
67 67
68 iofpga@3,00000000 { 68 iofpga@3,00000000 {
69 compatible = "arm,amba-bus", "simple-bus"; 69 compatible = "simple-bus";
70 #address-cells = <1>; 70 #address-cells = <1>;
71 #size-cells = <1>; 71 #size-cells = <1>;
72 ranges = <0 3 0 0x200000>; 72 ranges = <0 3 0 0x200000>;
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index e712c0af149b..47e4a115adef 100644
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -65,7 +65,7 @@
65 }; 65 };
66 66
67 iofpga@7,00000000 { 67 iofpga@7,00000000 {
68 compatible = "arm,amba-bus", "simple-bus"; 68 compatible = "simple-bus";
69 #address-cells = <1>; 69 #address-cells = <1>;
70 #size-cells = <1>; 70 #size-cells = <1>;
71 ranges = <0 7 0 0x20000>; 71 ranges = <0 7 0 0x20000>;
diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 65f716e11b95..7cfa8e414e7f 100644
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -184,7 +184,7 @@
184 }; 184 };
185 185
186 iofpga@3,00000000 { 186 iofpga@3,00000000 {
187 compatible = "arm,amba-bus", "simple-bus"; 187 compatible = "simple-bus";
188 #address-cells = <1>; 188 #address-cells = <1>;
189 #size-cells = <1>; 189 #size-cells = <1>;
190 ranges = <0 3 0 0x200000>; 190 ranges = <0 3 0 0x200000>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 5aa8bf4cfd53..3ad4c3000611 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -139,7 +139,7 @@
139 }; 139 };
140 140
141 iofpga@3,00000000 { 141 iofpga@3,00000000 {
142 compatible = "arm,amba-bus", "simple-bus"; 142 compatible = "simple-bus";
143 #address-cells = <1>; 143 #address-cells = <1>;
144 #size-cells = <1>; 144 #size-cells = <1>;
145 ranges = <0 3 0 0x200000>; 145 ranges = <0 3 0 0x200000>;
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 321b43b589ae..161ac98418a3 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -55,7 +55,7 @@
55 }; 55 };
56 56
57 iofpga@3,00000000 { 57 iofpga@3,00000000 {
58 compatible = "arm,amba-bus", "simple-bus"; 58 compatible = "simple-bus";
59 #address-cells = <1>; 59 #address-cells = <1>;
60 #size-cells = <1>; 60 #size-cells = <1>;
61 ranges = <0 3 0 0x200000>; 61 ranges = <0 3 0 0x200000>;
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-15 04:38:18 -0400