| Message ID | 20230113103346.29381-6-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: dt-bindings: rework/fix qcom-wdt | expand |
On Fri, Jan 13, 2023 at 11:33:44AM +0100, Krzysztof Kozlowski wrote: > Both of type of watchdogs described in the binding (the KPSS watchdog > and APSS WDT timer) have interrupts. Allow interrupts and describe them > for KPSS watchdog to fix warnings like: > > watchdog@17c10000: Unevaluated properties are not allowed ('interrupts' was unexpected) > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > --- > > Changes since v1: > 1. Add tag. > --- > .../bindings/watchdog/qcom-wdt.yaml | 24 ++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > index 1828eaf70b3b..b7fc57f4800e 100644 > --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > @@ -9,9 +9,6 @@ title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer > maintainers: > - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> > > -allOf: > - - $ref: watchdog.yaml# > - > properties: > compatible: > oneOf: > @@ -51,11 +48,31 @@ properties: > clocks: > maxItems: 1 > > + interrupts: > + minItems: 1 > + maxItems: 5 > + > required: > - compatible > - reg > - clocks > > +allOf: > + - $ref: watchdog.yaml# > + > + - if: > + properties: > + compatible: > + contains: > + const: qcom,kpss-wdt > + then: > + properties: > + interrupts: > + minItems: 1 > + items: > + - description: Bark > + - description: Bite > + > unevaluatedProperties: false > > examples: > @@ -66,5 +83,6 @@ examples: > compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; > reg = <0x17c10000 0x1000>; > clocks = <&sleep_clk>; > + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; > timeout-sec = <10>; > }; > -- > 2.34.1 >
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index 1828eaf70b3b..b7fc57f4800e 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -9,9 +9,6 @@ title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer maintainers: - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> -allOf: - - $ref: watchdog.yaml# - properties: compatible: oneOf: @@ -51,11 +48,31 @@ properties: clocks: maxItems: 1 + interrupts: + minItems: 1 + maxItems: 5 + required: - compatible - reg - clocks +allOf: + - $ref: watchdog.yaml# + + - if: + properties: + compatible: + contains: + const: qcom,kpss-wdt + then: + properties: + interrupts: + minItems: 1 + items: + - description: Bark + - description: Bite + unevaluatedProperties: false examples: @@ -66,5 +83,6 @@ examples: compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; reg = <0x17c10000 0x1000>; clocks = <&sleep_clk>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; timeout-sec = <10>; };
Both of type of watchdogs described in the binding (the KPSS watchdog and APSS WDT timer) have interrupts. Allow interrupts and describe them for KPSS watchdog to fix warnings like: watchdog@17c10000: Unevaluated properties are not allowed ('interrupts' was unexpected) Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> --- Changes since v1: 1. Add tag. --- .../bindings/watchdog/qcom-wdt.yaml | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)