diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-29 22:12:33 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-06-03 15:13:15 -0400 |
commit | 15b7cc78f0951e418c940d8b3b6a7a3b962b7748 (patch) | |
tree | b59692a7eb2b2aa4dd81e35ddde19c88aa357a11 | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) |
arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2
Tree-wide replacement was done by commit 2ef7d5f342c1 (ARM, ARM64:
dts: drop "arm,amba-bus" in favor of "simple-bus"), but we have some
new users of "arm,amba-bus" at Linux 4.7-rc1. Eliminate them now.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Chanho Min <chanho.min@lge.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm64/boot/dts/lg/lg1312.dtsi | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi b/arch/arm64/boot/dts/lg/lg1312.dtsi index 3a4e9a2ab313..fbafa24cd533 100644 --- a/arch/arm64/boot/dts/lg/lg1312.dtsi +++ b/arch/arm64/boot/dts/lg/lg1312.dtsi | |||
@@ -125,7 +125,7 @@ | |||
125 | #size-cells = <1>; | 125 | #size-cells = <1>; |
126 | #interrupts-cells = <3>; | 126 | #interrupts-cells = <3>; |
127 | 127 | ||
128 | compatible = "arm,amba-bus"; | 128 | compatible = "simple-bus"; |
129 | interrupt-parent = <&gic>; | 129 | interrupt-parent = <&gic>; |
130 | ranges; | 130 | ranges; |
131 | 131 | ||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a143b0..d7f8e06910bc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi | |||
@@ -163,7 +163,7 @@ | |||
163 | }; | 163 | }; |
164 | 164 | ||
165 | amba { | 165 | amba { |
166 | compatible = "arm,amba-bus"; | 166 | compatible = "simple-bus"; |
167 | #address-cells = <2>; | 167 | #address-cells = <2>; |
168 | #size-cells = <2>; | 168 | #size-cells = <2>; |
169 | ranges; | 169 | ranges; |