2021-12-13 20:37:18

by David Heidelberg

Subject: [PATCH] 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

Signed-off-by: David Heidelberg <[email protected]>
---
.../bindings/watchdog/qcom-wdt.yaml | 33 +++++++++++--------
1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index ba60bdf1fecc..71cd392d298b 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -14,20 +14,25 @@ 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-sm8150
- - 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-sm8150
+ - 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.33.0

2021-12-13 20:55:03

by Bjorn Andersson

Subject: Re: [PATCH] dt-bindings: watchdog: improve QCOM compatible parsing for modern chips

On Mon 13 Dec 12:37 PST 2021, David Heidelberg wrote:

> 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]>

Regards,
Bjorn

> Signed-off-by: David Heidelberg <[email protected]>
> ---
> .../bindings/watchdog/qcom-wdt.yaml | 33 +++++++++++--------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> index ba60bdf1fecc..71cd392d298b 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> @@ -14,20 +14,25 @@ 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-sm8150
> - - 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-sm8150
> + - 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.33.0
>

2021-12-15 20:27:11

by Rob Herring (Arm)

Subject: Re: [PATCH] dt-bindings: watchdog: improve QCOM compatible parsing for modern chips

On Mon, 13 Dec 2021 21:37:10 +0100, David Heidelberg wrote:
> 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
>
> Signed-off-by: David Heidelberg <[email protected]>
> ---
> .../bindings/watchdog/qcom-wdt.yaml | 33 +++++++++++--------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>

Reviewed-by: Rob Herring <[email protected]>