Skip to contentSkip to conversation

dt-bindings: watchdog: improve QCOM compatible parsing for modern chips

PATCH Superseded David Heidelberg 3 participants 4 messages Jan 11, 2022 – May 7, 2022

Subsystems (3)
Device tree bindings Arm Qualcomm mailing list Watchdog device drivers

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

David Heidelberg

author
#0 lore raw

PATCH v2 1/1 dt-bindings: watchdog: improve QCOM compatible parsing for modern chips

Parse compatible as expected for modern QCOMs.

Fixes warnings as:
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: ['qcom,apss-wdt-sdm845', 'qcom,kpss-wdt'] is too long
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: Additional items are not allowed ('qcom,kpss-wdt' was unexpected)
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Reviewed-by Bjorn Andersson <[email protected]>
Reviewed-by Rob Herring <[email protected]>
Signed-off-by David Heidelberg <[email protected]>

---
v2:
- updated compatible list as two compatibles has been added upstream -> resolve merge conflict

---
 .../bindings/watchdog/qcom-wdt.yaml           | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +21 -16
index 16c6f82a13ca..4ff8c59c59ab 100644
@@ -14,22 +14,27 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - qcom,apss-wdt-qcs404
-      - qcom,apss-wdt-sc7180
-      - qcom,apss-wdt-sc7280
-      - qcom,apss-wdt-sdm845
-      - qcom,apss-wdt-sdx55
-      - qcom,apss-wdt-sm6350
-      - qcom,apss-wdt-sm8150
-      - qcom,apss-wdt-sm8250
-      - qcom,kpss-timer
-      - qcom,kpss-wdt
-      - qcom,kpss-wdt-apq8064
-      - qcom,kpss-wdt-ipq4019
-      - qcom,kpss-wdt-ipq8064
-      - qcom,kpss-wdt-msm8960
-      - qcom,scss-timer
+    oneOf:
+      - items:
+          - enum:
+              - qcom,apss-wdt-qcs404
+              - qcom,apss-wdt-sc7180
+              - qcom,apss-wdt-sc7280
+              - qcom,apss-wdt-sdm845
+              - qcom,apss-wdt-sdx55
+              - qcom,apss-wdt-sm6350
+              - qcom,apss-wdt-sm8150
+              - qcom,apss-wdt-sm8250
+          - const: qcom,kpss-wdt
+      - items:
+          - enum:
+              - qcom,kpss-wdt
+              - qcom,kpss-timer
+              - qcom,kpss-wdt-apq8064
+              - qcom,kpss-wdt-ipq4019
+              - qcom,kpss-wdt-ipq8064
+              - qcom,kpss-wdt-msm8960
+              - qcom,scss-timer
 
   reg:
     maxItems: 1
Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 11 lines · David Heidelberg

Parse compatible as expected for modern QCOMs.

Fixes warnings as:
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: ['qcom,apss-wdt-sdm845', 'qcom,kpss-wdt'] is too long
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: Additional items are not allowed ('qcom,kpss-wdt' was unexpected)
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Reviewed-by Bjorn Andersson <[email protected]>
Reviewed-by Rob Herring <[email protected]>
Signed-off-by David Heidelberg <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Quoted 57 lines

---
v2:
- updated compatible list as two compatibles has been added upstream -> resolve merge conflict

---
  .../bindings/watchdog/qcom-wdt.yaml           | 37 +++++++++++--------
  1 file changed, 21 insertions(+), 16 deletions(-)
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +21 -16
index 16c6f82a13ca..4ff8c59c59ab 100644
@@ -14,22 +14,27 @@ allOf:
 
  properties:
    compatible:
-    enum:
-      - qcom,apss-wdt-qcs404
-      - qcom,apss-wdt-sc7180
-      - qcom,apss-wdt-sc7280
-      - qcom,apss-wdt-sdm845
-      - qcom,apss-wdt-sdx55
-      - qcom,apss-wdt-sm6350
-      - qcom,apss-wdt-sm8150
-      - qcom,apss-wdt-sm8250
-      - qcom,kpss-timer
-      - qcom,kpss-wdt
-      - qcom,kpss-wdt-apq8064
-      - qcom,kpss-wdt-ipq4019
-      - qcom,kpss-wdt-ipq8064
-      - qcom,kpss-wdt-msm8960
-      - qcom,scss-timer
+    oneOf:
+      - items:
+          - enum:
+              - qcom,apss-wdt-qcs404
+              - qcom,apss-wdt-sc7180
+              - qcom,apss-wdt-sc7280
+              - qcom,apss-wdt-sdm845
+              - qcom,apss-wdt-sdx55
+              - qcom,apss-wdt-sm6350
+              - qcom,apss-wdt-sm8150
+              - qcom,apss-wdt-sm8250
+          - const: qcom,kpss-wdt
+      - items:
+          - enum:
+              - qcom,kpss-wdt
+              - qcom,kpss-timer
+              - qcom,kpss-wdt-apq8064
+              - qcom,kpss-wdt-ipq4019
+              - qcom,kpss-wdt-ipq8064
+              - qcom,kpss-wdt-msm8960
+              - qcom,scss-timer
 
    reg:
      maxItems: 1
#2 lore raw
In reply to David Heidelberg
Quoted 11 lines · David Heidelberg

Parse compatible as expected for modern QCOMs.

Fixes warnings as:
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: ['qcom,apss-wdt-sdm845', 'qcom,kpss-wdt'] is too long
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: Additional items are not allowed ('qcom,kpss-wdt' was unexpected)
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Reviewed-by Bjorn Andersson <[email protected]>
Reviewed-by Rob Herring <[email protected]>
Signed-off-by David Heidelberg <[email protected]>
Quoted 7 lines

---
v2:
- updated compatible list as two compatibles has been added upstream -> resolve merge conflict

---
 .../bindings/watchdog/qcom-wdt.yaml           | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

It seems this patch received three reviews but was not picked up. David, do you plan to work on this?

Quoted 35 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +10 -16
index 16c6f82a13ca..4ff8c59c59ab 100644
@@ -14,22 +14,27 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - qcom,apss-wdt-qcs404
-      - qcom,apss-wdt-sc7180
-      - qcom,apss-wdt-sc7280
-      - qcom,apss-wdt-sdm845
-      - qcom,apss-wdt-sdx55
-      - qcom,apss-wdt-sm6350
-      - qcom,apss-wdt-sm8150
-      - qcom,apss-wdt-sm8250
-      - qcom,kpss-timer
-      - qcom,kpss-wdt
-      - qcom,kpss-wdt-apq8064
-      - qcom,kpss-wdt-ipq4019
-      - qcom,kpss-wdt-ipq8064
-      - qcom,kpss-wdt-msm8960
-      - qcom,scss-timer
+    oneOf:
+      - items:
+          - enum:
+              - qcom,apss-wdt-qcs404
+              - qcom,apss-wdt-sc7180
+              - qcom,apss-wdt-sc7280
+              - qcom,apss-wdt-sdm845
+              - qcom,apss-wdt-sdx55
+              - qcom,apss-wdt-sm6350
+              - qcom,apss-wdt-sm8150

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml allOf: · line 36

Quoted 10 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +10 -0
+              - qcom,apss-wdt-sm8250
+          - const: qcom,kpss-wdt
+      - items:
+          - enum:
+              - qcom,kpss-wdt
+              - qcom,kpss-timer
+              - qcom,kpss-wdt-apq8064
+              - qcom,kpss-wdt-ipq4019
+              - qcom,kpss-wdt-ipq8064
+              - qcom,kpss-wdt-msm8960

These do not look correct without appropriate fallback.

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml allOf: · line 40

Quoted 4 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +1 -0
+              - qcom,scss-timer
 
   reg:
     maxItems: 1

Best regards,
Krzysztof

author
#3 lore raw
Quoted 59 lines · Krzysztof Kozlowski
Quoted 11 lines · David Heidelberg

Parse compatible as expected for modern QCOMs.

Fixes warnings as:
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: ['qcom,apss-wdt-sdm845', 'qcom,kpss-wdt'] is too long
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dt.yaml: watchdog@17980000: compatible: Additional items are not allowed ('qcom,kpss-wdt' was unexpected)
From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Reviewed-by Bjorn Andersson <[email protected]>
Reviewed-by Rob Herring <[email protected]>
Signed-off-by David Heidelberg <[email protected]>
Quoted 7 lines

---
v2:
- updated compatible list as two compatibles has been added upstream -> resolve merge conflict

---
  .../bindings/watchdog/qcom-wdt.yaml           | 37 +++++++++++--------
  1 file changed, 21 insertions(+), 16 deletions(-)

It seems this patch received three reviews but was not picked up. David, do you plan to work on this?

Quoted 37 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +13 -16
index 16c6f82a13ca..4ff8c59c59ab 100644
@@ -14,22 +14,27 @@ allOf:
 
  properties:
    compatible:
-    enum:
-      - qcom,apss-wdt-qcs404
-      - qcom,apss-wdt-sc7180
-      - qcom,apss-wdt-sc7280
-      - qcom,apss-wdt-sdm845
-      - qcom,apss-wdt-sdx55
-      - qcom,apss-wdt-sm6350
-      - qcom,apss-wdt-sm8150
-      - qcom,apss-wdt-sm8250
-      - qcom,kpss-timer
-      - qcom,kpss-wdt
-      - qcom,kpss-wdt-apq8064
-      - qcom,kpss-wdt-ipq4019
-      - qcom,kpss-wdt-ipq8064
-      - qcom,kpss-wdt-msm8960
-      - qcom,scss-timer
+    oneOf:
+      - items:
+          - enum:
+              - qcom,apss-wdt-qcs404
+              - qcom,apss-wdt-sc7180
+              - qcom,apss-wdt-sc7280
+              - qcom,apss-wdt-sdm845
+              - qcom,apss-wdt-sdx55
+              - qcom,apss-wdt-sm6350
+              - qcom,apss-wdt-sm8150
+              - qcom,apss-wdt-sm8250
+          - const: qcom,kpss-wdt
+      - items:
Quoted 8 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml allOf: · line 36

Quoted 7 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +7 -0
+          - enum:
+              - qcom,kpss-wdt
+              - qcom,kpss-timer
+              - qcom,kpss-wdt-apq8064
+              - qcom,kpss-wdt-ipq4019
+              - qcom,kpss-wdt-ipq8064
+              - qcom,kpss-wdt-msm8960

These do not look correct without appropriate fallback.

Yes the situation there isn't optimal and I'm afraid I cannot solve it in scope of this change.

Previously I was thinking about also merging MSM timer into this binding, which shares the compatible, but uses different driver. Sadly, currently don't have a time for it (have some WIP patch locally, if anyone interested to take a look).

I'm (re-)sending v3 with another S-off, but it solves only warnings described in commit message.

David

Quoted 8 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml allOf: · line 40

Quoted 5 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +1 -0
+              - qcom,scss-timer
 
    reg:
      maxItems: 1

Best regards,
Krzysztof

Signature · 4 lines
David Heidelberg
Consultant Software Engineer

Matrix: @okias:matrix.org