| Message ID | 20230113103346.29381-4-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | b8c8f8649ba1765cbd7e5c92f36c6553a9fadedf |
| Headers | show |
| Series | watchdog: dt-bindings: rework/fix qcom-wdt | expand |
On Fri, Jan 13, 2023 at 11:33:42AM +0100, Krzysztof Kozlowski wrote: > The MSM timer ("qcom,msm-timer") is a bit different timer and watchdog > device than KPSS watchdog. It has its own generic and specific > compatibles, so fix the list to reflect this. Adjust the example to > show the newer KPSS watchdog. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > --- > > Changes since v1: > 1. Add tag. > --- > .../devicetree/bindings/watchdog/qcom-wdt.yaml | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > index 3e0b30a817d6..93e4381067dd 100644 > --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml > @@ -33,13 +33,16 @@ properties: > - const: qcom,kpss-wdt > - const: qcom,kpss-wdt > deprecated: true > + - items: > + - const: qcom,scss-timer > + - const: qcom,msm-timer > - items: > - enum: > - - qcom,kpss-timer > - qcom,kpss-wdt-apq8064 > - qcom,kpss-wdt-ipq8064 > - qcom,kpss-wdt-msm8960 > - - qcom,scss-timer > + - const: qcom,kpss-timer > + - const: qcom,msm-timer > > reg: > maxItems: 1 > @@ -56,9 +59,11 @@ unevaluatedProperties: false > > examples: > - | > - watchdog@208a038 { > - compatible = "qcom,kpss-wdt-ipq8064"; > - reg = <0x0208a038 0x40>; > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + watchdog@17c10000 { > + compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; > + reg = <0x17c10000 0x1000>; > clocks = <&sleep_clk>; > 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 3e0b30a817d6..93e4381067dd 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -33,13 +33,16 @@ properties: - const: qcom,kpss-wdt - const: qcom,kpss-wdt deprecated: true + - items: + - const: qcom,scss-timer + - const: qcom,msm-timer - items: - enum: - - qcom,kpss-timer - qcom,kpss-wdt-apq8064 - qcom,kpss-wdt-ipq8064 - qcom,kpss-wdt-msm8960 - - qcom,scss-timer + - const: qcom,kpss-timer + - const: qcom,msm-timer reg: maxItems: 1 @@ -56,9 +59,11 @@ unevaluatedProperties: false examples: - | - watchdog@208a038 { - compatible = "qcom,kpss-wdt-ipq8064"; - reg = <0x0208a038 0x40>; + #include <dt-bindings/interrupt-controller/arm-gic.h> + + watchdog@17c10000 { + compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; + reg = <0x17c10000 0x1000>; clocks = <&sleep_clk>; timeout-sec = <10>; };
The MSM timer ("qcom,msm-timer") is a bit different timer and watchdog device than KPSS watchdog. It has its own generic and specific compatibles, so fix the list to reflect this. Adjust the example to show the newer KPSS watchdog. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Rob Herring <robh@kernel.org> --- Changes since v1: 1. Add tag. --- .../devicetree/bindings/watchdog/qcom-wdt.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)