Skip to contentSkip to conversation

arm64: dts: k3: Resolve remaining dtbs_check warnings

PATCH Superseded Jan Kiszka 2 participants 6 messages Jun 26, 2024 – Jun 28, 2024

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

v2 cover arm64: dts: k3: Resolve remaining dtbs_check warnings

Changes in v2:
- reference reg-mux.yaml in am654-system-controller child node
- base on top of dedicated am654-serdes-ctrl schema patch

This goes on top of
https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/
and
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20240616-dt-bindings-mfd-syscon-split-v2-5-571b5850174a@linaro.org/

As we are working in this area, having a zero-warning baseline helps a lot finding own issues quicker. Maybe not all of the suggested resolutions are optimal, open for feedback, just want to have them all fixed now soon.

Jan

Jan Kiszka (4):
arm64: dts: ti: k3-j72xx-mcu-wakeup: add dedicated wakeup controller
compatible
arm64: dts: ti: k3-am642-evm: Silence schema warning
dt-bindings: soc: ti: am645-system-controller: add child nodes used by
main domain
arm64: dts: ti: k3-am65-main: add system controller compatible

 .../soc/ti/ti,am654-system-controller.yaml    | 25 +++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am642-evm.dts       |  4 +++
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi      |  2 +-
 .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi      |  2 +-
 .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi      |  2 +-
 .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi     |  2 +-
 6 files changed, 33 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH v2 1/4 arm64: dts: ti: k3-j72xx-mcu-wakeup: add dedicated wakeup controller compatible

From: Jan Kiszka <[email protected]>

Each syscon node must come with a dedicated/specific compatible, which is also reported by dtbs_check:

k3-j7200-common-proc-board.dtb: scm-conf@40f00000: compatible: ['syscon', 'simple-mfd'] is too short

Add one for the TI K3 AM654 MCU wakeup system controller used in J72xx SoCs.

---
 arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi  | 2 +-
 arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi  | 2 +-
 arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi +1 -1
index fccaabfb1348..3a78a3c1676d 100644
@@ -165,7 +165,7 @@ mcu_timer9: timer@40490000 {
 	};
 
 	mcu_conf: syscon@40f00000 {
-		compatible = "syscon", "simple-mfd";
+		compatible = "ti,am654-system-controller", "syscon", "simple-mfd";
 		reg = <0x00 0x40f00000 0x00 0x20000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +1 -1
index 9349ae07c046..d68e33d71eb3 100644
@@ -35,7 +35,7 @@ k3_reset: reset-controller {
 	};
 
 	mcu_conf: syscon@40f00000 {
-		compatible = "syscon", "simple-mfd";
+		compatible = "ti,am654-system-controller", "syscon", "simple-mfd";
 		reg = <0x0 0x40f00000 0x0 0x20000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +1 -1
index 5ccb04c7c462..1edb71f4a1bb 100644
@@ -140,7 +140,7 @@ wkup_gpio_intr: interrupt-controller@42200000 {
 	};
 
 	mcu_conf: syscon@40f00000 {
-		compatible = "syscon", "simple-mfd";
+		compatible = "ti,am654-system-controller", "syscon", "simple-mfd";
 		reg = <0x0 0x40f00000 0x0 0x20000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH v2 2/4 arm64: dts: ti: k3-am642-evm: Silence schema warning

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

The resolves

k3-am642-evm.dtb: adc: 'ti,adc-channels' is a required property
from schema $id: http://devicetree.org/schemas/iio/adc/ti,am3359-adc.yaml#

As the adc is reserved, thus not used by Linux, this has no practical impact.

---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-evm.dts +4 -0
index e20e4ffd0f1f..0e42d09aa785 100644
@@ -640,6 +640,10 @@ cpsw3g_phy0: ethernet-phy@0 {
 &tscadc0 {
 	/* ADC is reserved for R5 usage */
 	status = "reserved";
+
+	adc {
+		ti,adc-channels = <0 1 2 3 4 5 6 7>;
+	};
 };
 
 &ospi0 {
Signature · 1 line
2.43.0
author
#3 lore raw

PATCH v2 3/4 dt-bindings: soc: ti: am645-system-controller: add child nodes used by main domain

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Expand bindings to cover both the MCU and the main usage of the AM654 system controller.

---
 .../soc/ti/ti,am654-system-controller.yaml    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
Documentation/devicetree/bindings/soc/ti/ti,am654-system-controller.yaml +25 -0
index e79803e586ca..a03e13cf2677 100644
@@ -34,6 +34,31 @@ patternProperties:
     type: object
     $ref: /schemas/phy/ti,phy-gmii-sel.yaml#
 
+  "^mux-controller$":
+    type: object
+    ref: /schemas/mux/reg-mux.yaml#
+    description:
+      This is the SERDES lane control mux.
+
+  "^clock@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/soc/ti/ti,am654-serdes-ctrl.yaml#
+
+  "^dss-oldi-io-ctrl@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/mfd/syscon.yaml#
+    properties:
+      compatible:
+        items:
+          - const: ti,am654-dss-oldi-io-ctrl
+          - const: syscon
+
+  "^clock-controller@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/clock/ti,am654-ehrpwm-tbclk.yaml#
+    description:
+      Clock provider for TI EHRPWM nodes.
+
 required:
   - compatible
   - reg
Signature · 1 line
2.43.0
maintainer
#4 lore raw

Re: [PATCH v2 3/4] dt-bindings: soc: ti: am645-system-controller: add child nodes used by main domain

Quoted 15 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

Expand bindings to cover both the MCU and the main usage of the AM654 system controller.

---
 .../soc/ti/ti,am654-system-controller.yaml    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
Documentation/devicetree/bindings/soc/ti/ti,am654-system-controller.yaml +0 -0
index e79803e586ca..a03e13cf2677 100644

Documentation/devicetree/bindings/soc/ti/ti,am654-system-controller.yaml patternProperties: · line 37

Quoted 4 lines
Documentation/devicetree/bindings/soc/ti/ti,am654-system-controller.yaml +1 -0
@@ -34,6 +34,31 @@ patternProperties:
     type: object
     $ref: /schemas/phy/ti,phy-gmii-sel.yaml#
 
+  "^mux-controller$":

That's not a pattern, but fixed string. Move to 'properties'. I thought the tools check this. Maybe it didn't apply to rc1 for the bot and you didn't test either?

Quoted 30 lines
Documentation/devicetree/bindings/soc/ti/ti,am654-system-controller.yaml +24 -0
+    type: object
+    ref: /schemas/mux/reg-mux.yaml#
+    description:
+      This is the SERDES lane control mux.
+
+  "^clock@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/soc/ti/ti,am654-serdes-ctrl.yaml#
+
+  "^dss-oldi-io-ctrl@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/mfd/syscon.yaml#
+    properties:
+      compatible:
+        items:
+          - const: ti,am654-dss-oldi-io-ctrl
+          - const: syscon
+
+  "^clock-controller@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/clock/ti,am654-ehrpwm-tbclk.yaml#
+    description:
+      Clock provider for TI EHRPWM nodes.
+
 required:
   - compatible
   - reg
Signature · 1 line
2.43.0
author
#5 lore raw

PATCH v2 4/4 arm64: dts: ti: k3-am65-main: add system controller compatible

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Now that the TI K3 AM654 system controller bindings also cover the usage in the main domain, add its compatible to address dtbs_check complaints:

k3-am654-base-board.dtb: scm-conf@100000: compatible: ['syscon', 'simple-mfd'] is too short

---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +1 -1
index b08f43812384..258f73fa9b1f 100644
@@ -471,7 +471,7 @@ sdhci1: mmc@4fa0000 {
 	};
 
 	scm_conf: scm-conf@100000 {
-		compatible = "syscon", "simple-mfd";
+		compatible = "ti,am654-system-controller", "syscon", "simple-mfd";
 		reg = <0 0x00100000 0 0x1c000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.43.0