diff mbox series

dt-bindings: mmc: Fix unevaluatedProperties warnings in examples

Message ID 20220526014204.2873107-1-robh@kernel.org
State New
Headers show
Series dt-bindings: mmc: Fix unevaluatedProperties warnings in examples | expand

Commit Message

Rob Herring (Arm) May 26, 2022, 1:42 a.m. UTC
The 'unevaluatedProperties' schema checks is not fully working and doesn't
catch some cases where there's a $ref to another schema. A fix is pending,
but results in new warnings in examples. Fix the warnings by removing
spurious properties or adding a missing property to the schema.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml  | 2 --
 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Ulf Hansson June 1, 2022, 12:46 p.m. UTC | #1
On Thu, 26 May 2022 at 03:42, Rob Herring <robh@kernel.org> wrote:
>
> The 'unevaluatedProperties' schema checks is not fully working and doesn't
> catch some cases where there's a $ref to another schema. A fix is pending,
> but results in new warnings in examples. Fix the warnings by removing
> spurious properties or adding a missing property to the schema.
>
> Signed-off-by: Rob Herring <robh@kernel.org>

Queued for v5.20 on the devel branch, thanks!

Kind regards
Uffe


> ---
>  Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml  | 2 --
>  Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 3 +++
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> index b672202fff4e..5ecdac9de484 100644
> --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> @@ -75,7 +75,6 @@ examples:
>        sd-uhs-sdr104;
>        sdhci,auto-cmd12;
>        interrupts = <0x0 0x26 0x4>;
> -      interrupt-names = "sdio0_0";
>        clocks = <&scmi_clk 245>;
>        clock-names = "sw_sdio";
>      };
> @@ -94,7 +93,6 @@ examples:
>        non-removable;
>        bus-width = <0x8>;
>        interrupts = <0x0 0x27 0x4>;
> -      interrupt-names = "sdio1_0";
>        clocks = <&scmi_clk 245>;
>        clock-names = "sw_sdio";
>      };
> diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> index c79639e9027e..aca1a4a8daea 100644
> --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> @@ -56,6 +56,9 @@ properties:
>        - const: core
>        - const: axi
>
> +  interrupts:
> +    maxItems: 1
> +
>    marvell,xenon-sdhc-id:
>      $ref: /schemas/types.yaml#/definitions/uint32
>      minimum: 0
> --
> 2.34.1
>
Rob Herring (Arm) June 1, 2022, 2:04 p.m. UTC | #2
On Wed, Jun 01, 2022 at 02:46:21PM +0200, Ulf Hansson wrote:
> On Thu, 26 May 2022 at 03:42, Rob Herring <robh@kernel.org> wrote:
> >
> > The 'unevaluatedProperties' schema checks is not fully working and doesn't
> > catch some cases where there's a $ref to another schema. A fix is pending,
> > but results in new warnings in examples. Fix the warnings by removing
> > spurious properties or adding a missing property to the schema.
> >
> > Signed-off-by: Rob Herring <robh@kernel.org>
> 
> Queued for v5.20 on the devel branch, thanks!

Can you take for 5.19 instead so I can enable this in dtschema sooner 
rather than later?

Rob
Ulf Hansson June 1, 2022, 2:20 p.m. UTC | #3
On Wed, 1 Jun 2022 at 16:04, Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Jun 01, 2022 at 02:46:21PM +0200, Ulf Hansson wrote:
> > On Thu, 26 May 2022 at 03:42, Rob Herring <robh@kernel.org> wrote:
> > >
> > > The 'unevaluatedProperties' schema checks is not fully working and doesn't
> > > catch some cases where there's a $ref to another schema. A fix is pending,
> > > but results in new warnings in examples. Fix the warnings by removing
> > > spurious properties or adding a missing property to the schema.
> > >
> > > Signed-off-by: Rob Herring <robh@kernel.org>
> >
> > Queued for v5.20 on the devel branch, thanks!
>
> Can you take for 5.19 instead so I can enable this in dtschema sooner
> rather than later?

Sure! I have moved the patch to the fixes branch now.

Kind regards
Uffe
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
index b672202fff4e..5ecdac9de484 100644
--- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
+++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
@@ -75,7 +75,6 @@  examples:
       sd-uhs-sdr104;
       sdhci,auto-cmd12;
       interrupts = <0x0 0x26 0x4>;
-      interrupt-names = "sdio0_0";
       clocks = <&scmi_clk 245>;
       clock-names = "sw_sdio";
     };
@@ -94,7 +93,6 @@  examples:
       non-removable;
       bus-width = <0x8>;
       interrupts = <0x0 0x27 0x4>;
-      interrupt-names = "sdio1_0";
       clocks = <&scmi_clk 245>;
       clock-names = "sw_sdio";
     };
diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index c79639e9027e..aca1a4a8daea 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -56,6 +56,9 @@  properties:
       - const: core
       - const: axi
 
+  interrupts:
+    maxItems: 1
+
   marvell,xenon-sdhc-id:
     $ref: /schemas/types.yaml#/definitions/uint32
     minimum: 0