Commit 2ef7d5f3 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Olof Johansson

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 301c6e0b
...@@ -107,7 +107,7 @@ reset: reset@2010031000 { ...@@ -107,7 +107,7 @@ reset: reset@2010031000 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
......
...@@ -368,7 +368,7 @@ exynos_usbphy: exynos-usbphy@125B0000 { ...@@ -368,7 +368,7 @@ exynos_usbphy: exynos-usbphy@125B0000 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -653,7 +653,7 @@ pwm: pwm@139D0000 { ...@@ -653,7 +653,7 @@ pwm: pwm@139D0000 {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges; ranges;
......
...@@ -380,7 +380,7 @@ exynos_usbphy: exynos-usbphy@125B0000 { ...@@ -380,7 +380,7 @@ exynos_usbphy: exynos-usbphy@125B0000 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
...@@ -674,7 +674,7 @@ pwm: pwm@12dd0000 { ...@@ -674,7 +674,7 @@ pwm: pwm@12dd0000 {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges; ranges;
......
...@@ -375,7 +375,7 @@ pinctrl_4: pinctrl@03860000 { ...@@ -375,7 +375,7 @@ pinctrl_4: pinctrl@03860000 {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges; ranges;
......
...@@ -200,7 +200,7 @@ gmac: ethernet@00230000 { ...@@ -200,7 +200,7 @@ gmac: ethernet@00230000 {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges; ranges;
}; };
......
...@@ -68,7 +68,7 @@ amba { ...@@ -68,7 +68,7 @@ amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges = <0 0xfc000000 0x2000000>; ranges = <0 0xfc000000 0x2000000>;
......
...@@ -43,7 +43,7 @@ soc { ...@@ -43,7 +43,7 @@ soc {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
ranges; ranges;
uart0: uart@10001000 { uart0: uart@10001000 {
......
...@@ -34,7 +34,7 @@ soc { ...@@ -34,7 +34,7 @@ soc {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
ranges; ranges;
timer0: timer@00002000 { timer0: timer@00002000 {
......
...@@ -57,7 +57,7 @@ flash@24000000 { ...@@ -57,7 +57,7 @@ flash@24000000 {
}; };
fpga { fpga {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -722,7 +722,7 @@ sdcc4bam:dma@121c2000{ ...@@ -722,7 +722,7 @@ sdcc4bam:dma@121c2000{
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -187,7 +187,7 @@ vsdcc_fixed: vsdcc-regulator { ...@@ -187,7 +187,7 @@ vsdcc_fixed: vsdcc-regulator {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -251,7 +251,7 @@ vsdcc_fixed: vsdcc-regulator { ...@@ -251,7 +251,7 @@ vsdcc_fixed: vsdcc-regulator {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -95,7 +95,7 @@ cpu1: cpu@f01 { ...@@ -95,7 +95,7 @@ cpu1: cpu@f01 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -96,7 +96,7 @@ cpu3: cpu@f03 { ...@@ -96,7 +96,7 @@ cpu3: cpu@f03 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -134,7 +134,7 @@ cpu3: cpu@503 { ...@@ -134,7 +134,7 @@ cpu3: cpu@503 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -67,7 +67,7 @@ aliases { ...@@ -67,7 +67,7 @@ aliases {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -130,7 +130,7 @@ wakeup-interrupt-controller { ...@@ -130,7 +130,7 @@ wakeup-interrupt-controller {
amba { amba {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "arm,amba-bus"; compatible = "simple-bus";
ranges; ranges;
pdma0: dma@e0900000 { pdma0: dma@e0900000 {
......
...@@ -69,7 +69,7 @@ soc { ...@@ -69,7 +69,7 @@ soc {
ranges; ranges;
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -63,7 +63,7 @@ soc { ...@@ -63,7 +63,7 @@ soc {
ranges; ranges;
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -721,7 +721,7 @@ stw5095@1a { ...@@ -721,7 +721,7 @@ stw5095@1a {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -384,7 +384,7 @@ fwcam1: fwcam@5d { ...@@ -384,7 +384,7 @@ fwcam1: fwcam@5d {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -148,7 +148,7 @@ lcd@10008000 { ...@@ -148,7 +148,7 @@ lcd@10008000 {
}; };
amba { amba {
compatible = "arm,amba-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -66,7 +66,7 @@ usb@2,03000000 { ...@@ -66,7 +66,7 @@ usb@2,03000000 {
}; };
iofpga@3,00000000 { iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 3 0 0x200000>; ranges = <0 3 0 0x200000>;
......
...@@ -65,7 +65,7 @@ usb@3,03000000 { ...@@ -65,7 +65,7 @@ usb@3,03000000 {
}; };
iofpga@7,00000000 { iofpga@7,00000000 {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 7 0 0x20000>; ranges = <0 7 0 0x20000>;
......
...@@ -184,7 +184,7 @@ v2m_refclk32khz: refclk32khz { ...@@ -184,7 +184,7 @@ v2m_refclk32khz: refclk32khz {
}; };
iofpga@3,00000000 { iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 3 0 0x200000>; ranges = <0 3 0 0x200000>;
......
...@@ -139,7 +139,7 @@ usb@5,00000000 { ...@@ -139,7 +139,7 @@ usb@5,00000000 {
}; };
iofpga@3,00000000 { iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 3 0 0x200000>; ranges = <0 3 0 0x200000>;
......
...@@ -55,7 +55,7 @@ v2m_refclk32khz: refclk32khz { ...@@ -55,7 +55,7 @@ v2m_refclk32khz: refclk32khz {
}; };
iofpga@3,00000000 { iofpga@3,00000000 {
compatible = "arm,amba-bus", "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 3 0 0x200000>; ranges = <0 3 0 0x200000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment