Convert QCOM watchdog timer bindings to YAML

PATCH Applied Sai Prakash Ranjan 3 participants 9 messages Dec 13, 2019 – Jan 13, 2020

Subsystems (4)

Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support Watchdog device drivers

lore

Share & tools

lore

Sai Prakash Ranjan

author

2019-12-13 04:53 UTC #0 lore raw

cover Convert QCOM watchdog timer bindings to YAML

This series converts QCOM watchdog timer bindings to YAML. Also it adds the missing SoC-specific compatible for QCS404, SC7180, SDM845 and SM8150 SoCs.

Sai Prakash Ranjan (3):
dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845,

    SM8150

arm64: dts: qcom: qcs404: Update the compatible for watchdog timer

 .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 ---------
 .../bindings/watchdog/qcom-wdt.yaml           | 59 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/qcs404.dtsi          |  2 +-
 3 files changed, 60 insertions(+), 29 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Sai Prakash Ranjan

author

2019-12-13 04:53 UTC #1 lore raw

PATCH 1/3 dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML

Convert QCOM watchdog timer bindings to DT schema format using json-schema.

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 -----------
 .../bindings/watchdog/qcom-wdt.yaml           | 47 +++++++++++++++++++
 2 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Documentation/devicetree/bindings/watchdog/qcom-wdt.txt deleted +0 ~~-28~~

deleted file mode 100644
index 41aeaa2ff0f8..000000000000
@@ -1,28 +0,0 @@
-Qualcomm Krait Processor Sub-system (KPSS) Watchdog
----------------------------------------------------
-
-Required properties :
-- compatible : shall contain only one of the following:
-
-			"qcom,kpss-wdt-msm8960"
-			"qcom,kpss-wdt-apq8064"
-			"qcom,kpss-wdt-ipq8064"
-			"qcom,kpss-wdt-ipq4019"
-			"qcom,kpss-timer"
-			"qcom,scss-timer"
-			"qcom,kpss-wdt"
-
-- reg : shall contain base register location and length
-- clocks : shall contain the input clock
-
-Optional properties :
-- timeout-sec : shall contain the default watchdog timeout in seconds,
-                if unset, the default timeout is 30 seconds
-
-Example:
-	watchdog@208a038 {
-		compatible = "qcom,kpss-wdt-ipq8064";
-		reg = <0x0208a038 0x40>;
-		clocks = <&sleep_clk>;
-		timeout-sec = <10>;
-	};

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +47 -0

47 lines not on this page · raw message

---

I have added Andy as the maintainer here since the get_maintainer script showed him. If he is not happy, then I can change it to Bjorn probably and again if he is not happy ;-) then I will add myself or whoever they suggest.

--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

Rob Herring

maintainer

2019-12-19 23:26 UTC #2 lore raw

Re: [PATCH 1/3] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML

Quoted 29 lines · Sai Prakash Ranjan

Convert QCOM watchdog timer bindings to DT schema format using json-schema.

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 -----------
 .../bindings/watchdog/qcom-wdt.yaml           | 47 +++++++++++++++++++
 2 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +11 -0

new file mode 100644
index 000000000000..4a42f4261322
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer
+
+maintainers:
+  - Andy Gross <[email protected]>
+

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml line 21

Quoted 10 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +10 -0

+properties:
+  compatible:
+    oneOf:
+      - const: qcom,kpss-timer
+      - const: qcom,kpss-wdt
+      - const: qcom,kpss-wdt-apq8064
+      - const: qcom,kpss-wdt-ipq4019
+      - const: qcom,kpss-wdt-ipq8064
+      - const: qcom,kpss-wdt-msm8960
+      - const: qcom,scss-timer

An 'enum' is better than oneOf+const.

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml line 33

Quoted 12 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +12 -0

+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  timeout-sec:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Contains the watchdog timeout in seconds. If unset, the
+      default timeout is 30 seconds.

Include watchdog.yaml and don't redefine this.

Quoted 16 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +14 -1

+
+required:
+  - compatible
+  - reg
+  - clocks
+
+examples:
+  - |
+    watchdog@208a038 {
+      compatible = "qcom,kpss-wdt-ipq8064";
+      reg = <0x0208a038 0x40>;
+      clocks = <&sleep_clk>;
+      timeout-sec = <10>;
+    };
---

Quoted 3 lines

I have added Andy as the maintainer here since the get_maintainer script showed him. If he is not happy, then I can change it to Bjorn probably and again if he is not happy ;-) then I will add myself or whoever they suggest.

Add yourself.

Rob

Sai Prakash Ranjan

author

2020-01-13 05:49 UTC #3 lore raw

Re: [PATCH 1/3] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML

Quoted 37 lines · Rob Herring

Quoted 36 lines · Sai Prakash Ranjan

Convert QCOM watchdog timer bindings to DT schema format using json-schema.

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 -----------
 .../bindings/watchdog/qcom-wdt.yaml           | 47 
+++++++++++++++++++
 2 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 
Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
 create mode 100644

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +15 -0

new file mode 100644
index 000000000000..4a42f4261322
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer
+
+maintainers:
+  - Andy Gross <[email protected]>
+
+properties:
+  compatible:
+    oneOf:
+      - const: qcom,kpss-timer

Quoted 9 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml line 21
Quoted 6 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +6 -0
+      - const: qcom,kpss-wdt
+      - const: qcom,kpss-wdt-apq8064
+      - const: qcom,kpss-wdt-ipq4019
+      - const: qcom,kpss-wdt-ipq8064
+      - const: qcom,kpss-wdt-msm8960
+      - const: qcom,scss-timer
An 'enum' is better than oneOf+const.

Will change.

Quoted 6 lines

Quoted 6 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +6 -0
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1

Quoted 9 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml line 33
Quoted 6 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +6 -0
+
+  timeout-sec:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Contains the watchdog timeout in seconds. If unset, the
+      default timeout is 30 seconds.
Include watchdog.yaml and don't redefine this.

Quoted 16 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml new file +14 -1

+
+required:
+  - compatible
+  - reg
+  - clocks
+
+examples:
+  - |
+    watchdog@208a038 {
+      compatible = "qcom,kpss-wdt-ipq8064";
+      reg = <0x0208a038 0x40>;
+      clocks = <&sleep_clk>;
+      timeout-sec = <10>;
+    };
---

Quoted 6 lines

Quoted 3 lines
I have added Andy as the maintainer here since the get_maintainer script showed him. If he is not happy, then I can change it to Bjorn probably and again if he is not happy ;-) then I will add myself or whoever they suggest.
Add yourself.

Sure will add myself.

Thanks,
Sai

Signature · 7 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Sai Prakash Ranjan

author

2019-12-13 04:53 UTC #4 lore raw

PATCH 2/3 dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150

In reply to Sai Prakash Ranjan

Add missing compatible for watchdog timer on QCS404, SC7180, SDM845 and SM8150 SoCs.

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 .../devicetree/bindings/watchdog/qcom-wdt.yaml       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +12 -0

index 4a42f4261322..ec25ce1c9e2e 100644
@@ -12,6 +12,18 @@ maintainers:
 properties:
   compatible:
     oneOf:
+      - items:
+          - const: qcom,apss-wdt-sc7180
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sdm845
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sm8150
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-qcs404
+          - const: qcom,kpss-wdt
       - const: qcom,kpss-timer
       - const: qcom,kpss-wdt
       - const: qcom,kpss-wdt-apq8064

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Rob Herring

maintainer

2019-12-19 23:28 UTC #5 lore raw

Re: [PATCH 2/3] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150

Quoted 18 lines · Sai Prakash Ranjan

Add missing compatible for watchdog timer on QCS404, SC7180, SDM845 and SM8150 SoCs.
Signed-off-by Sai Prakash Ranjan <[email protected]>
---
 .../devicetree/bindings/watchdog/qcom-wdt.yaml       | 12 ++++++++++++
 1 file changed, 12 insertions(+)
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +2 -0
index 4a42f4261322..ec25ce1c9e2e 100644
@@ -12,6 +12,18 @@ maintainers:
 properties:
   compatible:
     oneOf:
+      - items:
+          - const: qcom,apss-wdt-sc7180

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml maintainers: · line 26

Quoted 10 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +10 -0

+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sdm845
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sm8150
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-qcs404
+          - const: qcom,kpss-wdt

This can be one entry:

- items:
- enum:
- ...
- const: qcom,kpss-wdt

Quoted 7 lines

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +0 -0

       - const: qcom,kpss-timer
       - const: qcom,kpss-wdt
       - const: qcom,kpss-wdt-apq8064

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Sai Prakash Ranjan

author

2020-01-13 05:47 UTC #6 lore raw

Re: [PATCH 2/3] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150

Hi Rob,

Quoted 33 lines · Rob Herring

Quoted 19 lines · Sai Prakash Ranjan
Add missing compatible for watchdog timer on QCS404, SC7180, SDM845 and SM8150 SoCs.
Signed-off-by Sai Prakash Ranjan <[email protected]>
---
 .../devicetree/bindings/watchdog/qcom-wdt.yaml       | 12 
++++++++++++
 1 file changed, 12 insertions(+)
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +2 -0
index 4a42f4261322..ec25ce1c9e2e 100644
@@ -12,6 +12,18 @@ maintainers:
 properties:
   compatible:
     oneOf:
+      - items:
+          - const: qcom,apss-wdt-sc7180
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml maintainers: · line 26
Quoted 10 lines
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +10 -0
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sdm845
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-sm8150
+          - const: qcom,kpss-wdt
+      - items:
+          - const: qcom,apss-wdt-qcs404
+          - const: qcom,kpss-wdt
This can be one entry:

Quoted 5 lines

- items:
- enum:
- ...
- const: qcom,kpss-wdt

Will change in next version.

Thanks,
Sai

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Sai Prakash Ranjan

author

2019-12-13 04:53 UTC #7 lore raw

PATCH 3/3 arm64: dts: qcom: qcs404: Update the compatible for watchdog timer

In reply to Sai Prakash Ranjan

Update the compatible for QCS404 watchdog timer with proper SoC specific compatible.

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm64/boot/dts/qcom/qcs404.dtsi +1 -1

index f5f0c4c9cb16..c9e8e629045b 100644
@@ -905,7 +905,7 @@
 		};
 
 		watchdog@b017000 {
-			compatible = "qcom,kpss-wdt";
+			compatible = "qcom,apss-wdt-qcs404", "qcom,kpss-wdt";
 			reg = <0x0b017000 0x1000>;
 			clocks = <&sleep_clk>;
 		};

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Bjorn Andersson

Applied

2019-12-20 00:40 UTC #8 lore raw

Re: [PATCH 3/3] arm64: dts: qcom: qcs404: Update the compatible for watchdog timer

Quoted 3 lines · Sai Prakash Ranjan

Update the compatible for QCS404 watchdog timer with proper SoC specific compatible.

Applied

Thanks,
Bjorn

Quoted 21 lines

Signed-off-by Sai Prakash Ranjan <[email protected]>

---
 arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm64/boot/dts/qcom/qcs404.dtsi +1 -1

index f5f0c4c9cb16..c9e8e629045b 100644
@@ -905,7 +905,7 @@
 		};
 
 		watchdog@b017000 {
-			compatible = "qcom,kpss-wdt";
+			compatible = "qcom,apss-wdt-qcs404", "qcom,kpss-wdt";
 			reg = <0x0b017000 0x1000>;
 			clocks = <&sleep_clk>;
 		};

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation