| Message ID | 20210428230500.19214-1-s-anna@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dt-bindings: mmc: sdhci-am654: Remove duplicate ti, j721e-sdhci-4bit | expand |
On Thu, 29 Apr 2021 at 01:05, Suman Anna <s-anna@ti.com> wrote: > > The commit 7c7905df68c5 ("dt-bindings: mmc: sdhci-am654: fix compatible > for j7200") switched the compatible property from a regular enum to an > more appropriate combinatorial oneOf convention, and in the process has > introduced a duplicate ti,j721e-sdhci-4bit. > > This generated the following warning on J721E boards that use the > ti,j721e-sdhci-4bit for two nodes: > "mmc@4fb0000: compatible: More than one condition true in oneOf schema" > "mmc@4f98000: compatible: More than one condition true in oneOf schema" > > Remove the duplicate to fix this. > > Fixes: 7c7905df68c5 ("dt-bindings: mmc: sdhci-am654: fix compatible for j7200") > Signed-off-by: Suman Anna <s-anna@ti.com> Applied for next, thanks! Kind regards Uffe > --- > Hi Ulf, > > The warning is a bit more verbose, I have minimized the log in above > commit message. You can see the issue with dtbs_check on both latest > master and linux-next using DT_SCHEMA_FILES. > > regards > Suman > > Documentation/devicetree/bindings/mmc/sdhci-am654.yaml | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml > index 3a79e39253d2..29399e88ac53 100644 > --- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml > +++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml > @@ -19,7 +19,6 @@ properties: > - const: ti,am654-sdhci-5.1 > - const: ti,j721e-sdhci-8bit > - const: ti,j721e-sdhci-4bit > - - const: ti,j721e-sdhci-4bit > - const: ti,am64-sdhci-8bit > - const: ti,am64-sdhci-4bit > - items: > -- > 2.30.1 >
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml index 3a79e39253d2..29399e88ac53 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml @@ -19,7 +19,6 @@ properties: - const: ti,am654-sdhci-5.1 - const: ti,j721e-sdhci-8bit - const: ti,j721e-sdhci-4bit - - const: ti,j721e-sdhci-4bit - const: ti,am64-sdhci-8bit - const: ti,am64-sdhci-4bit - items:
The commit 7c7905df68c5 ("dt-bindings: mmc: sdhci-am654: fix compatible for j7200") switched the compatible property from a regular enum to an more appropriate combinatorial oneOf convention, and in the process has introduced a duplicate ti,j721e-sdhci-4bit. This generated the following warning on J721E boards that use the ti,j721e-sdhci-4bit for two nodes: "mmc@4fb0000: compatible: More than one condition true in oneOf schema" "mmc@4f98000: compatible: More than one condition true in oneOf schema" Remove the duplicate to fix this. Fixes: 7c7905df68c5 ("dt-bindings: mmc: sdhci-am654: fix compatible for j7200") Signed-off-by: Suman Anna <s-anna@ti.com> --- Hi Ulf, The warning is a bit more verbose, I have minimized the log in above commit message. You can see the issue with dtbs_check on both latest master and linux-next using DT_SCHEMA_FILES. regards Suman Documentation/devicetree/bindings/mmc/sdhci-am654.yaml | 1 - 1 file changed, 1 deletion(-)