2021-01-15 19:34:37

by Grygorii Strashko

Subject: [PATCH] dt-bindings: mmc: sdhci-am654: fix compatible for j7200

On TI J7200 SoC the SDHCI controller compatible defined as
"ti,j7200-sdhci-8bit", "ti,j721e-sdhci-8bit"
or
"ti,j7200-sdhci-4bit", "ti,j721e-sdhci-4bit"
which causes dtbs_check warnings:
mmc@4f80000: compatible: ['ti,j7200-sdhci-8bit', 'ti,j721e-sdhci-8bit'] is too long
mmc@4f80000: compatible: Additional items are not allowed ('ti,j721e-sdhci-8bit' was unexpected)
mmc@4fb0000: compatible:0: 'ti,j7200-sdhci-4bit' is not one of ['ti,am654-sdhci-5.1', 'ti,j721e-sdhci-8bit',
'ti,j721e-sdhci-4bit', 'ti,j7200-sdhci-8bit', 'ti,j721e-sdhci-4bit', 'ti,am64-sdhci-8bit', 'ti,am64-sdhci-4bit']
mmc@4fb0000: compatible: ['ti,j7200-sdhci-4bit', 'ti,j721e-sdhci-4bit'] is too long
mmc@4fb0000: compatible: Additional items are not allowed ('ti,j721e-sdhci-4bit' was unexpected)

Fix it by adding missing compatible strings and their combinations.

Fixes: 407d0c2cdd12 ("dt-bindings: mmc: sdhci-am654: Convert sdhci-am654 controller documentation to json schema")
Signed-off-by: Grygorii Strashko <[email protected]>
---
.../devicetree/bindings/mmc/sdhci-am654.yaml | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
index 34e53db29428..3a79e39253d2 100644
--- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
+++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
@@ -15,14 +15,19 @@ allOf:

properties:
compatible:
- enum:
- - ti,am654-sdhci-5.1
- - ti,j721e-sdhci-8bit
- - ti,j721e-sdhci-4bit
- - ti,j7200-sdhci-8bit
- - ti,j721e-sdhci-4bit
- - ti,am64-sdhci-8bit
- - ti,am64-sdhci-4bit
+ oneOf:
+ - 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:
+ - const: ti,j7200-sdhci-8bit
+ - const: ti,j721e-sdhci-8bit
+ - items:
+ - const: ti,j7200-sdhci-4bit
+ - const: ti,j721e-sdhci-4bit

reg:
maxItems: 2
--
2.17.1

2021-01-19 13:55:21

by Ulf Hansson

Subject: Re: [PATCH] dt-bindings: mmc: sdhci-am654: fix compatible for j7200

On Fri, 15 Jan 2021 at 20:32, Grygorii Strashko
<[email protected]> wrote:
>
> On TI J7200 SoC the SDHCI controller compatible defined as
> "ti,j7200-sdhci-8bit", "ti,j721e-sdhci-8bit"
> or
> "ti,j7200-sdhci-4bit", "ti,j721e-sdhci-4bit"
> which causes dtbs_check warnings:
> mmc@4f80000: compatible: ['ti,j7200-sdhci-8bit', 'ti,j721e-sdhci-8bit'] is too long
> mmc@4f80000: compatible: Additional items are not allowed ('ti,j721e-sdhci-8bit' was unexpected)
> mmc@4fb0000: compatible:0: 'ti,j7200-sdhci-4bit' is not one of ['ti,am654-sdhci-5.1', 'ti,j721e-sdhci-8bit',
> 'ti,j721e-sdhci-4bit', 'ti,j7200-sdhci-8bit', 'ti,j721e-sdhci-4bit', 'ti,am64-sdhci-8bit', 'ti,am64-sdhci-4bit']
> mmc@4fb0000: compatible: ['ti,j7200-sdhci-4bit', 'ti,j721e-sdhci-4bit'] is too long
> mmc@4fb0000: compatible: Additional items are not allowed ('ti,j721e-sdhci-4bit' was unexpected)
>
> Fix it by adding missing compatible strings and their combinations.
>
> Fixes: 407d0c2cdd12 ("dt-bindings: mmc: sdhci-am654: Convert sdhci-am654 controller documentation to json schema")
> Signed-off-by: Grygorii Strashko <[email protected]>

Applied for next, thanks!

Kind regards
Uffe


> ---
> .../devicetree/bindings/mmc/sdhci-am654.yaml | 21 ++++++++++++-------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
> index 34e53db29428..3a79e39253d2 100644
> --- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
> +++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
> @@ -15,14 +15,19 @@ allOf:
>
> properties:
> compatible:
> - enum:
> - - ti,am654-sdhci-5.1
> - - ti,j721e-sdhci-8bit
> - - ti,j721e-sdhci-4bit
> - - ti,j7200-sdhci-8bit
> - - ti,j721e-sdhci-4bit
> - - ti,am64-sdhci-8bit
> - - ti,am64-sdhci-4bit
> + oneOf:
> + - 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:
> + - const: ti,j7200-sdhci-8bit
> + - const: ti,j721e-sdhci-8bit
> + - items:
> + - const: ti,j7200-sdhci-4bit
> + - const: ti,j721e-sdhci-4bit
>
> reg:
> maxItems: 2
> --
> 2.17.1
>