Skip to contentSkip to conversation

arm64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 2

PATCH Applied Masahiro Yamada 4 participants 4 messages May 30, 2016 – Jun 3, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

In order to not leave these compatible strings for the release, is it OK to apply this patch for Linux 4.7 ?

 arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/lg/lg1312.dtsi +1 -1
index 3a4e9a2..fbafa24 100644
@@ -125,7 +125,7 @@
 		#size-cells = <1>;
 		#interrupts-cells = <3>;
 
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		interrupt-parent = <&gic>;
 		ranges;
 
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
index 46f325a..d7f8e06 100644
@@ -163,7 +163,7 @@
 	};
 
 	amba {
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
Signature · 1 line
1.9.1
maintainer Acked-by on v1 1/1
#1 lore raw

Am Montag, 30. Mai 2016, 11:12:33 schrieb Masahiro Yamada:

Quoted 5 lines

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.

For the Rockchip part,

Quoted 37 lines

---

In order to not leave these compatible strings for the release, is it OK to apply this patch for Linux 4.7 ?

 arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/lg/lg1312.dtsi index 3a4e9a2..fbafa24 100644

arch/arm64/boot/dts/lg/lg1312.dtsi +1 -1
@@ -125,7 +125,7 @@
 		#size-cells = <1>;
 		#interrupts-cells = <3>;
 
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		interrupt-parent = <&gic>;
 		ranges;
 
(quoted diff) +0 -0

b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 46f325a..d7f8e06 100644

arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -163,7 +163,7 @@
 	};
 
 	amba {
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Masahiro Yamada
Quoted 26 lines

Subject: [PATCH] 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.

---

In order to not leave these compatible strings for the release, is it OK to apply this patch for Linux 4.7 ?

 arch/arm64/boot/dts/lg/lg1312.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/lg/lg1312.dtsi +0 -0
index 3a4e9a2..fbafa24 100644

arch/arm64/boot/dts/lg/lg1312.dtsi line 131

Quoted 8 lines
arch/arm64/boot/dts/lg/lg1312.dtsi +1 -1
@@ -125,7 +125,7 @@
 		#size-cells = <1>;
 		#interrupts-cells = <3>;
 
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		interrupt-parent = <&gic>;
 		ranges;
 
Quoted 16 lines
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -2
index 46f325a..d7f8e06 100644
@@ -163,7 +163,7 @@
 	};
 
 	amba {
-		compatible = "arm,amba-bus";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
--

1.9.1

#3 lore raw
In reply to Masahiro Yamada
Quoted 9 lines · Masahiro Yamada

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.

---

In order to not leave these compatible strings for the release, is it OK to apply this patch for Linux 4.7 ?

Thanks, applied to fixes.

-Olof