Skip to contentSkip to conversation

ARM64: dts: amlogic: use generic bus node names

PATCH New Kevin Hilman 2 participants 3 messages Dec 6, 2017 – Dec 7, 2017

Subsystems (2)
Device tree bindings Arm/Amlogic Meson SoC support
lore
Share & tools
lore

Kevin Hilman

author maintainer
#0 lore raw

PATCH 1/1 ARM64: dts: amlogic: use generic bus node names

The DT spec recommends that node-names have generic names like "bus". Fix that in the Amlogic DTs, while leaving the label names to have more SoC-specific names that match with the HW documentation.

Suggested-by Stephen Boyd <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +2 -2
index b932a784b02a..e7213eb53958 100644
@@ -113,7 +113,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at ffd00000 {
+		cbus: bus at ffd00000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xffd00000 0x0 0x25000>;
 			#address-cells = <2>;

@@ -175,7 +175,7 @@
 			};
 		};
 
-		aobus: aobus at ff800000 {
+		aobus: bus at ff800000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xff800000 0x0 0x100000>;
 			#address-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +3 -3
index 7cdbf58a062f..6cb3c2a52baf 100644
@@ -211,7 +211,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at c1100000 {
+		cbus: bus at c1100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc1100000 0x0 0x100000>;
 			#address-cells = <2>;

@@ -366,7 +366,7 @@
 			};
 		};
 
-		aobus: aobus at c8100000 {
+		aobus: bus at c8100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc8100000 0x0 0x100000>;
 			#address-cells = <2>;

@@ -453,7 +453,7 @@
 			};
 		};
 
-		hiubus: hiubus at c883c000 {
+		hiubus: bus at c883c000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc883c000 0x0 0x2000>;
 			#address-cells = <2>;
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 ARM64: dts: amlogic: use generic bus node names

Quoted 57 lines · Kevin Hilman

The DT spec recommends that node-names have generic names like "bus". Fix that in the Amlogic DTs, while leaving the label names to have more SoC-specific names that match with the HW documentation.

Suggested-by Stephen Boyd <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +2 -2
index b932a784b02a..e7213eb53958 100644
@@ -113,7 +113,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at ffd00000 {
+		cbus: bus at ffd00000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xffd00000 0x0 0x25000>;
 			#address-cells = <2>;

@@ -175,7 +175,7 @@
 			};
 		};
 
-		aobus: aobus at ff800000 {
+		aobus: bus at ff800000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xff800000 0x0 0x100000>;
 			#address-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +2 -2
index 7cdbf58a062f..6cb3c2a52baf 100644
@@ -211,7 +211,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at c1100000 {
+		cbus: bus at c1100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc1100000 0x0 0x100000>;
 			#address-cells = <2>;

@@ -366,7 +366,7 @@
 			};
 		};
 
-		aobus: aobus at c8100000 {
+		aobus: bus at c8100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc8100000 0x0 0x100000>;
 			#address-cells = <2>;

arch/arm64/boot/dts/amlogic/meson-gx.dtsi line 459

Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -1
@@ -453,7 +453,7 @@
 			};
 		};
 
-		hiubus: hiubus at c883c000 {
+		hiubus: bus at c883c000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc883c000 0x0 0x2000>;
 			#address-cells = <2>;
Reviewed-by Neil Armstrong <[email protected]>
author maintainer Applied
#2 lore raw

PATCH 1/1 ARM64: dts: amlogic: use generic bus node names

Quoted 60 lines · Neil Armstrong
Quoted 59 lines · Kevin Hilman

The DT spec recommends that node-names have generic names like "bus". Fix that in the Amlogic DTs, while leaving the label names to have more SoC-specific names that match with the HW documentation.

Suggested-by Stephen Boyd <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +2 -2
index b932a784b02a..e7213eb53958 100644
@@ -113,7 +113,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at ffd00000 {
+		cbus: bus at ffd00000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xffd00000 0x0 0x25000>;
 			#address-cells = <2>;

@@ -175,7 +175,7 @@
 			};
 		};
 
-		aobus: aobus at ff800000 {
+		aobus: bus at ff800000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xff800000 0x0 0x100000>;
 			#address-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +2 -2
index 7cdbf58a062f..6cb3c2a52baf 100644
@@ -211,7 +211,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		cbus: cbus at c1100000 {
+		cbus: bus at c1100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc1100000 0x0 0x100000>;
 			#address-cells = <2>;

@@ -366,7 +366,7 @@
 			};
 		};
 
-		aobus: aobus at c8100000 {
+		aobus: bus at c8100000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc8100000 0x0 0x100000>;
 			#address-cells = <2>;

@@ -453,7 +453,7 @@
 			};
 		};
Quoted 8 lines

arch/arm64/boot/dts/amlogic/meson-gx.dtsi line 459

Quoted 6 lines
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -1
-		hiubus: hiubus at c883c000 {
+		hiubus: bus at c883c000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xc883c000 0x0 0x2000>;
 			#address-cells = <2>;
Reviewed-by Neil Armstrong <[email protected]>

Applied to v4.16/dt64 with Neil's review and after doing some basic build/boot tests.

Thanks,

Kevin