Skip to contentSkip to conversation

arm64: dts: sc9860: add missing aon-prediv unit address

PATCH Applied Krzysztof Kozlowski 2 participants 6 messages Apr 1, 2024 – Apr 24, 2024

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

Krzysztof Kozlowski

author
#0 lore raw

PATCH 1/5 arm64: dts: sc9860: add missing aon-prediv unit address

Nodes with "reg" property are supposed to have unit address, as reported by dtc W=1 warning:

sc9860.dtsi:210.26-216.5: Warning (simple_bus_reg): /soc/aon-prediv: simple-bus unit address format error, expected "402d0000"

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm64/boot/dts/sprd/sc9860.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/sprd/sc9860.dtsi +1 -1
index e27eb3ed1d47..b933979c9eee 100644
@@ -207,7 +207,7 @@ ap_clk: clock-controller@20000000 {
 			#clock-cells = <1>;
 		};
 
-		aon_prediv: aon-prediv {
+		aon_prediv: aon-prediv@402d0000 {
 			compatible = "sprd,sc9860-aon-prediv";
 			reg = <0 0x402d0000 0 0x400>;
 			clocks = <&ext_26m>, <&pll 0>,
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/5 arm64: dts: sc9860: move GPIO keys to board

GPIO keys are properties of a board, not SoC, because SoC physically does not have any keys or buttons.

This also fixes dtc W=1 build warning:

sc9860.dtsi:688.13-714.5: Warning (simple_bus_reg): /soc/gpio-keys: missing or empty reg/ranges property

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm64/boot/dts/sprd/sc9860.dtsi      | 28 -----------------------
 arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 28 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)
arch/arm64/boot/dts/sprd/sc9860.dtsi +0 -28
index b933979c9eee..e875dc8e3d98 100644
@@ -684,33 +684,5 @@ etm7_out: endpoint {
 				};
 			};
 		};
-
-		gpio-keys {
-			compatible = "gpio-keys";
-
-			key-volumedown {
-				label = "Volume Down Key";
-				linux,code = <KEY_VOLUMEDOWN>;
-				gpios = <&eic_debounce 2 GPIO_ACTIVE_LOW>;
-				debounce-interval = <2>;
-				wakeup-source;
-			};
-
-			key-volumeup {
-				label = "Volume Up Key";
-				linux,code = <KEY_VOLUMEUP>;
-				gpios = <&pmic_eic 10 GPIO_ACTIVE_HIGH>;
-				debounce-interval = <2>;
-				wakeup-source;
-			};
-
-			key-power {
-				label = "Power Key";
-				linux,code = <KEY_POWER>;
-				gpios = <&pmic_eic 1 GPIO_ACTIVE_HIGH>;
-				debounce-interval = <2>;
-				wakeup-source;
-			};
-		};
 	};
 };
arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +28 -0
index 6b95fd94cee3..9b4128d9c5bb 100644
@@ -34,6 +34,34 @@ chosen {
 		stdout-path = "serial1:115200n8";
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		key-volumedown {
+			label = "Volume Down Key";
+			linux,code = <KEY_VOLUMEDOWN>;
+			gpios = <&eic_debounce 2 GPIO_ACTIVE_LOW>;
+			debounce-interval = <2>;
+			wakeup-source;
+		};
+
+		key-volumeup {
+			label = "Volume Up Key";
+			linux,code = <KEY_VOLUMEUP>;
+			gpios = <&pmic_eic 10 GPIO_ACTIVE_HIGH>;
+			debounce-interval = <2>;
+			wakeup-source;
+		};
+
+		key-power {
+			label = "Power Key";
+			linux,code = <KEY_POWER>;
+			gpios = <&pmic_eic 1 GPIO_ACTIVE_HIGH>;
+			debounce-interval = <2>;
+			wakeup-source;
+		};
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 3/5 arm64: dts: sc9860: move GIC to soc node

In reply to Krzysztof Kozlowski

All devices on MMIO bus should be within the "soc" node.

Signed-off-by Krzysztof Kozlowski <[email protected]>

---

Not tested on hardware.

---
 arch/arm64/boot/dts/sprd/sc9860.dtsi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/sprd/sc9860.dtsi +12 -12
index e875dc8e3d98..16be9a405267 100644
@@ -135,18 +135,6 @@ CLUSTER_PD: cluster_pd {
 		};
 	};
 
-	gic: interrupt-controller@12001000 {
-		compatible = "arm,gic-400";
-		reg = <0 0x12001000 0 0x1000>,
-		      <0 0x12002000 0 0x2000>,
-		      <0 0x12004000 0 0x2000>,
-		      <0 0x12006000 0 0x2000>;
-		#interrupt-cells = <3>;
-		interrupt-controller;
-		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8)
-					| IRQ_TYPE_LEVEL_HIGH)>;
-	};
-
 	psci {
 		compatible = "arm,psci-0.2";
 		method = "smc";

@@ -185,6 +173,18 @@ pmu {
 	};
 
 	soc {
+		gic: interrupt-controller@12001000 {
+			compatible = "arm,gic-400";
+			reg = <0 0x12001000 0 0x1000>,
+			      <0 0x12002000 0 0x2000>,
+			      <0 0x12004000 0 0x2000>,
+			      <0 0x12006000 0 0x2000>;
+			#interrupt-cells = <3>;
+			interrupt-controller;
+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8)
+						| IRQ_TYPE_LEVEL_HIGH)>;
+		};
+
 		pmu_gate: pmu-gate {
 			compatible = "sprd,sc9860-pmu-gate";
 			sprd,syscon = <&pmu_regs>; /* 0x402b0000 */
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 4/5 arm64: dts: whale2: add missing ap-apb unit address

In reply to Krzysztof Kozlowski

Nodes with "reg" property are supposed to have unit address, as reported by dtc W=1 warning:

whale2.dtsi:67.10-116.5: Warning (simple_bus_reg): /soc/ap-apb: simple-bus unit address format error, expected "70000000"

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm64/boot/dts/sprd/whale2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/sprd/whale2.dtsi +1 -1
index fece49704b5c..7068bfd2f4c3 100644
@@ -64,7 +64,7 @@ ap_apb_regs: syscon@70b00000 {
 			reg = <0 0x70b00000 0 0x40000>;
 		};
 
-		ap-apb {
+		ap-apb@70000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 5/5 arm64: dts: sharkl3: add missing unit addresses

In reply to Krzysztof Kozlowski

Nodes with "reg" property are supposed to have unit address, as reported by dtc W=1 warning:

sharkl3.dtsi:42.23-48.6: Warning (unit_address_vs_reg): /soc/syscon@402b0000/pmu-gate: node has a reg or ranges property, but no unit name sharkl3.dtsi:59.29-63.6: Warning (unit_address_vs_reg): /soc/syscon@402e0000/aonapb-gate: node has a reg or ranges property, but no unit name sharkl3.dtsi:74.13-80.6: Warning (unit_address_vs_reg): /soc/syscon@40353000/pll: node has a reg or ranges property, but no unit name sharkl3.dtsi:91.15-95.6: Warning (unit_address_vs_reg): /soc/syscon@40359000/mpll: node has a reg or ranges property, but no unit name sharkl3.dtsi:106.15-112.6: Warning (unit_address_vs_reg): /soc/syscon@4035c000/rpll: node has a reg or ranges property, but no unit name sharkl3.dtsi:123.15-127.6: Warning (unit_address_vs_reg): /soc/syscon@40363000/dpll: node has a reg or ranges property, but no unit name sharkl3.dtsi:138.21-142.6: Warning (unit_address_vs_reg): /soc/syscon@60800000/mm-gate: node has a reg or ranges property, but no unit name sharkl3.dtsi:153.27-159.6: Warning (unit_address_vs_reg): /soc/syscon@71300000/apapb-gate: node has a reg or ranges property, but no unit name

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm64/boot/dts/sprd/sharkl3.dtsi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/sprd/sharkl3.dtsi +9 -9
index 206a4afdab1c..9b4ee0bdd69f 100644
@@ -24,7 +24,7 @@ ap_ahb_regs: syscon@20e00000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x20e00000 0x4000>;
 
-			apahb_gate: apahb-gate {
+			apahb_gate: apahb-gate@0 {
 				compatible = "sprd,sc9863a-apahb-gate";
 				reg = <0x0 0x1020>;
 				#clock-cells = <1>;

@@ -39,7 +39,7 @@ pmu_regs: syscon@402b0000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x402b0000 0x4000>;
 
-			pmu_gate: pmu-gate {
+			pmu_gate: pmu-gate@0 {
 				compatible = "sprd,sc9863a-pmu-gate";
 				reg = <0 0x1200>;
 				clocks = <&ext_26m>;

@@ -56,7 +56,7 @@ aon_apb_regs: syscon@402e0000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x402e0000 0x4000>;
 
-			aonapb_gate: aonapb-gate {
+			aonapb_gate: aonapb-gate@0 {
 				compatible = "sprd,sc9863a-aonapb-gate";
 				reg = <0 0x1100>;
 				#clock-cells = <1>;

@@ -71,7 +71,7 @@ anlg_phy_g2_regs: syscon@40353000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x40353000 0x3000>;
 
-			pll: pll {
+			pll: pll@0 {
 				compatible = "sprd,sc9863a-pll";
 				reg = <0 0x100>;
 				clocks = <&ext_26m>;

@@ -88,7 +88,7 @@ anlg_phy_g4_regs: syscon@40359000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x40359000 0x3000>;
 
-			mpll: mpll {
+			mpll: mpll@0 {
 				compatible = "sprd,sc9863a-mpll";
 				reg = <0 0x100>;
 				#clock-cells = <1>;

@@ -103,7 +103,7 @@ anlg_phy_g5_regs: syscon@4035c000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x4035c000 0x3000>;
 
-			rpll: rpll {
+			rpll: rpll@0 {
 				compatible = "sprd,sc9863a-rpll";
 				reg = <0 0x100>;
 				clocks = <&ext_26m>;

@@ -120,7 +120,7 @@ anlg_phy_g7_regs: syscon@40363000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x40363000 0x3000>;
 
-			dpll: dpll {
+			dpll: dpll@0 {
 				compatible = "sprd,sc9863a-dpll";
 				reg = <0 0x100>;
 				#clock-cells = <1>;

@@ -135,7 +135,7 @@ mm_ahb_regs: syscon@60800000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x60800000 0x3000>;
 
-			mm_gate: mm-gate {
+			mm_gate: mm-gate@0 {
 				compatible = "sprd,sc9863a-mm-gate";
 				reg = <0 0x1100>;
 				#clock-cells = <1>;

@@ -150,7 +150,7 @@ ap_apb_regs: syscon@71300000 {
 			#size-cells = <1>;
 			ranges = <0 0 0x71300000 0x4000>;
 
-			apapb_gate: apapb-gate {
+			apapb_gate: apapb-gate@0 {
 				compatible = "sprd,sc9863a-apapb-gate";
 				reg = <0 0x1000>;
 				clocks = <&ext_26m>;
Signature · 1 line
2.34.1
Applied
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 6 lines · Krzysztof Kozlowski

Nodes with "reg" property are supposed to have unit address, as reported by dtc W=1 warning:

sc9860.dtsi:210.26-216.5: Warning (simple_bus_reg): /soc/aon-prediv: simple-bus unit address format error, expected "402d0000"

Almost a month passed, no replies from maintainers about picking it up. Dunno, looks abandoned, so let me grab this. If anyone else wants to pick it up, let me know.

Applied, thanks!

[1/5] arm64: dts: sc9860: add missing aon-prediv unit address

      https://git.kernel.org/krzk/linux-dt/c/2c20032e1ed34edee457c64c266d2c5bb1c52fc5
[2/5] arm64: dts: sc9860: move GPIO keys to board
      https://git.kernel.org/krzk/linux-dt/c/74be4a8d52fd49243d7c533649d2ebbfd0f34f97
[3/5] arm64: dts: sc9860: move GIC to soc node
      https://git.kernel.org/krzk/linux-dt/c/653f383e7c02869792810244c94df468e4e322b1
[4/5] arm64: dts: whale2: add missing ap-apb unit address
      https://git.kernel.org/krzk/linux-dt/c/09dddc24eb359ca82b2ae526d3b51583130f4f07
[5/5] arm64: dts: sharkl3: add missing unit addresses
      https://git.kernel.org/krzk/linux-dt/c/e80ab9c9782b8928c8a1392eae7ae52445bd3881

Best regards,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>