diff mbox series

[2/2] dt-bindings: watchdog: qcom,pm8916-wdt: convert to dtschema

Message ID 20220726120215.101868-3-krzysztof.kozlowski@linaro.org (mailing list archive)
State Accepted
Headers show
Series power/reset/watchdog: dt-bindings: minor clean and qcom,pm8916-wdt to dtschema | expand

Commit Message

Krzysztof Kozlowski July 26, 2022, 12:02 p.m. UTC 
Convert the Qualcomm PM8916 watchdog timer controller bindings to DT
schema and include them in parent device schema.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/power/reset/qcom,pon.yaml        |  4 ++
 .../bindings/watchdog/qcom,pm8916-wdt.txt     | 28 ----------
 .../bindings/watchdog/qcom,pm8916-wdt.yaml    | 51 +++++++++++++++++++
 3 files changed, 55 insertions(+), 28 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml

Comments

Vinod Koul July 27, 2022, 5:22 a.m. UTC | #1 
On 26-07-22, 14:02, Krzysztof Kozlowski wrote:
> Convert the Qualcomm PM8916 watchdog timer controller bindings to DT
> schema and include them in parent device schema.

Reviewed-by: Vinod Koul <vkoul@kernel.org>

> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/power/reset/qcom,pon.yaml        |  4 ++
>  .../bindings/watchdog/qcom,pm8916-wdt.txt     | 28 ----------
>  .../bindings/watchdog/qcom,pm8916-wdt.yaml    | 51 +++++++++++++++++++
>  3 files changed, 55 insertions(+), 28 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
>  create mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
> 
> diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> index e8ecb75155db..e7b436d2e757 100644
> --- a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> +++ b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> @@ -36,6 +36,10 @@ properties:
>      type: object
>      $ref: /schemas/input/qcom,pm8941-pwrkey.yaml#
>  
> +  watchdog:
> +    type: object
> +    $ref: /schemas/watchdog/qcom,pm8916-wdt.yaml
> +
>  required:
>    - compatible
>    - reg
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
> deleted file mode 100644
> index 6fb984f31982..000000000000
> --- a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -QCOM PM8916 watchdog timer controller
> -
> -This pm8916 watchdog timer controller must be under pm8916-pon node.
> -
> -Required properties:
> -- compatible: should be "qcom,pm8916-wdt"
> -
> -Optional properties :
> -- interrupts : Watchdog pre-timeout (bark) interrupt.
> -- timeout-sec : Watchdog timeout value in seconds.
> -
> -Example:
> -
> -	pm8916_0: pm8916@0 {
> -		compatible = "qcom,pm8916", "qcom,spmi-pmic";
> -		reg = <0x0 SPMI_USID>;
> -
> -		pon@800 {
> -			compatible = "qcom,pm8916-pon";
> -			reg = <0x800>;
> -
> -			watchdog {
> -				compatible = "qcom,pm8916-wdt";
> -				interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
> -				timeout-sec = <10>;
> -			};
> -		};
> -	};
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
> new file mode 100644
> index 000000000000..568eb8480fc3
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
> @@ -0,0 +1,51 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/watchdog/qcom,pm8916-wdt.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm PM8916 watchdog timer controller
> +
> +maintainers:
> +  - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> +
> +allOf:
> +  - $ref: watchdog.yaml#
> +
> +properties:
> +  compatible:
> +    const: qcom,pm8916-wdt
> +
> +  interrupts:
> +    maxItems: 1
> +
> +required:
> +  - compatible
> +  - interrupts
> +
> +unevaluatedProperties: false
> +
> +examples:
> +  - |
> +    #include <dt-bindings/interrupt-controller/irq.h>
> +    #include <dt-bindings/spmi/spmi.h>
> +
> +    pmic@0 {
> +        compatible = "qcom,pm8916", "qcom,spmi-pmic";
> +        reg = <0x0 SPMI_USID>;
> +        #address-cells = <1>;
> +        #size-cells = <0>;
> +
> +        pon@800 {
> +            compatible = "qcom,pm8916-pon";
> +            reg = <0x800>;
> +            mode-bootloader = <0x2>;
> +            mode-recovery = <0x1>;
> +
> +            watchdog {
> +                compatible = "qcom,pm8916-wdt";
> +                interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
> +                timeout-sec = <60>;
> +            };
> +        };
> +    };
> -- 
> 2.34.1
Rob Herring July 27, 2022, 3:13 p.m. UTC | #2 
On Tue, 26 Jul 2022 14:02:15 +0200, Krzysztof Kozlowski wrote:
> Convert the Qualcomm PM8916 watchdog timer controller bindings to DT
> schema and include them in parent device schema.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../bindings/power/reset/qcom,pon.yaml        |  4 ++
>  .../bindings/watchdog/qcom,pm8916-wdt.txt     | 28 ----------
>  .../bindings/watchdog/qcom,pm8916-wdt.yaml    | 51 +++++++++++++++++++
>  3 files changed, 55 insertions(+), 28 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
>  create mode 100644 Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
> 

Applied, thanks!
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
index e8ecb75155db..e7b436d2e757 100644
--- a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
+++ b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
@@ -36,6 +36,10 @@  properties:
     type: object
     $ref: /schemas/input/qcom,pm8941-pwrkey.yaml#
 
+  watchdog:
+    type: object
+    $ref: /schemas/watchdog/qcom,pm8916-wdt.yaml
+
 required:
   - compatible
   - reg
diff --git a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
deleted file mode 100644
index 6fb984f31982..000000000000
--- a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.txt
+++ /dev/null
@@ -1,28 +0,0 @@ 
-QCOM PM8916 watchdog timer controller
-
-This pm8916 watchdog timer controller must be under pm8916-pon node.
-
-Required properties:
-- compatible: should be "qcom,pm8916-wdt"
-
-Optional properties :
-- interrupts : Watchdog pre-timeout (bark) interrupt.
-- timeout-sec : Watchdog timeout value in seconds.
-
-Example:
-
-	pm8916_0: pm8916@0 {
-		compatible = "qcom,pm8916", "qcom,spmi-pmic";
-		reg = <0x0 SPMI_USID>;
-
-		pon@800 {
-			compatible = "qcom,pm8916-pon";
-			reg = <0x800>;
-
-			watchdog {
-				compatible = "qcom,pm8916-wdt";
-				interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
-				timeout-sec = <10>;
-			};
-		};
-	};
diff --git a/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
new file mode 100644
index 000000000000..568eb8480fc3
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
@@ -0,0 +1,51 @@ 
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/watchdog/qcom,pm8916-wdt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm PM8916 watchdog timer controller
+
+maintainers:
+  - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+allOf:
+  - $ref: watchdog.yaml#
+
+properties:
+  compatible:
+    const: qcom,pm8916-wdt
+
+  interrupts:
+    maxItems: 1
+
+required:
+  - compatible
+  - interrupts
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/spmi/spmi.h>
+
+    pmic@0 {
+        compatible = "qcom,pm8916", "qcom,spmi-pmic";
+        reg = <0x0 SPMI_USID>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pon@800 {
+            compatible = "qcom,pm8916-pon";
+            reg = <0x800>;
+            mode-bootloader = <0x2>;
+            mode-recovery = <0x1>;
+
+            watchdog {
+                compatible = "qcom,pm8916-wdt";
+                interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
+                timeout-sec = <60>;
+            };
+        };
+    };