Skip to content

Commit

Permalink
ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus"
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Masahiro Yamada authored and Olof Johansson committed Mar 13, 2016
1 parent 301c6e0 commit 2ef7d5f
Show file tree
Hide file tree
Showing 29 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/axm55xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos3250.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
interrupt-parent = <&gic>;
ranges;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos4415.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
interrupt-parent = <&gic>;
ranges;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5420.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
interrupt-parent = <&gic>;
ranges;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5440.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
interrupt-parent = <&gic>;
ranges;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hi3620.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
interrupt-parent = <&gic>;
ranges = <0 0xfc000000 0x2000000>;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hip01.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
ranges;

uart0: uart@10001000 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/hisi-x5hd2.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
ranges;

timer0: timer@00002000 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/integrator.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
};

fpga {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom-apq8064.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom-msm8660.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom-msm8960.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/rk3036.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/rk3228.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/rk3288.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/rk3xxx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/s5pv210.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
amba {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,amba-bus";
compatible = "simple-bus";
ranges;

pdma0: dma@e0900000 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/socfpga.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
ranges;

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/socfpga_arria10.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
ranges;

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/ste-u300.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/versatile-ab.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
};

amba {
compatible = "arm,amba-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
};

iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 3 0 0x200000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/vexpress-v2m.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
};

iofpga@7,00000000 {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 7 0 0x20000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/arm/foundation-v8.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
};

iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 3 0 0x200000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/arm/juno-motherboard.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
};

iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 3 0 0x200000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
};

iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus";
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 3 0 0x200000>;
Expand Down

0 comments on commit 2ef7d5f

Please sign in to comment.