Skip to contentSkip to conversation

dt-bindings: mmc: Add missing properties used in examples

PATCH In review Rob Herring 4 participants 4 messages Dec 6, 2021 – Dec 9, 2021

Subsystems (7)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: mmc: Add missing properties used in examples

When 'unevaluatedProperties' support is enabled, the following warnings are generated in the mmc bindings:

Documentation/devicetree/bindings/mmc/mtk-sd.example.dt.yaml: mmc@11230000: Unevaluated properties are not allowed ('reg', 'interrupts' were unexpected) Documentation/devicetree/bindings/mmc/sdhci-am654.example.dt.yaml: mmc@4f80000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected) Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.example.dt.yaml: mmc@5a400000: Unevaluated properties are not allowed ('dma-names', 'dmas' were unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@80126000: Unevaluated properties are not allowed ('dmas', 'dma-names' were unexpected) Documentation/devicetree/bindings/mmc/arasan,sdhci.example.dt.yaml: mmc@80420000: Unevaluated properties are not allowed ('resets' was unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@52007000: Unevaluated properties are not allowed ('interrupt-names' was unexpected) Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: Unevaluated properties are not allowed ('power-domains' was unexpected)

Add the missing properties as necessary. For pl18x, drop interrupt-names as there isn't any use of it when there are 2 interrupts.

Cc Ulf Hansson <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Chaotian Jing <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wenbin Mei <[email protected]>
Cc Masahiro Yamada <[email protected]>
---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml  | 3 +++
 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml     | 9 ++++++++-
 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 +++
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml        | 6 ++++++
 Documentation/devicetree/bindings/mmc/sdhci-am654.yaml   | 2 ++
 .../devicetree/bindings/mmc/socionext,uniphier-sd.yaml   | 6 ++++++
 6 files changed, 28 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml +3 -0
index de6f076e0ece..83be9e93d221 100644
@@ -118,6 +118,9 @@ properties:
   phy-names:
     const: phy_arasan
 
+  resets:
+    maxItems: 1
+
   arasan,soc-ctl-syscon:
     $ref: /schemas/types.yaml#/definitions/phandle
     description:
Documentation/devicetree/bindings/mmc/arm,pl18x.yaml +8 -1
index 47595cb483be..fbc866d9bb2f 100644
@@ -60,6 +60,14 @@ properties:
     minItems: 1
     maxItems: 2
 
+  dmas:
+    maxItems: 2
+
+  dma-names:
+    items:
+      - const: rx
+      - const: tx
+
   power-domains: true
 
   resets:
@@ -213,7 +221,6 @@ examples:
       arm,primecell-periphid = <0x10153180>;
       reg = <0x52007000 0x1000>;
       interrupts = <49>;
-      interrupt-names = "cmd_irq";
       clocks = <&rcc 0>;
       clock-names = "apb_pclk";
       resets = <&rcc 1>;
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +3 -0
index 19621a2f8beb..8d5cef0d3039 100644
@@ -116,6 +116,9 @@ properties:
       - const: ahb
       - const: per
 
+  power-domains:
+    maxItems: 1
+
   pinctrl-names:
     oneOf:
       - minItems: 3
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +6 -0
index 82768a807294..faf89b0c918f 100644
@@ -36,6 +36,9 @@ properties:
           - const: mediatek,mt8195-mmc
           - const: mediatek,mt8183-mmc
 
+  reg:
+    maxItems: 1
+
   clocks:
     description:
       Should contain phandle for the clock feeding the MMC controller.
@@ -62,6 +65,9 @@ properties:
       - const: axi_cg
       - const: ahb_cg
 
+  interrupts:
+    maxItems: 1
+
   pinctrl-names:
     items:
       - const: default
Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +2 -0
index 224303f5b913..9fbf16b3bc8d 100644
@@ -48,6 +48,8 @@ properties:
       - const: clk_ahb
       - const: clk_xin
 
+  sdhci-caps-mask: true
+
   # PHY output tap delays:
   # Used to delay the data valid window and align it to the sampling clock.
   # Binding needs to be provided for each supported speed mode otherwise the
Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.yaml +6 -0
index 56f9ff12742d..a586fad0a46b 100644
@@ -26,6 +26,12 @@ properties:
   clocks:
     maxItems: 1
 
+  dmas:
+    maxItems: 1
+
+  dma-names:
+    const: rx-tx
+
   reset-names:
     description: |
       There are three reset signals at maximum
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Rob Herring

When 'unevaluatedProperties' support is enabled, the following warnings are generated in the mmc bindings:

Documentation/devicetree/bindings/mmc/mtk-sd.example.dt.yaml: mmc@11230000: Unevaluated properties are not allowed ('reg', 'interrupts' were unexpected) Documentation/devicetree/bindings/mmc/sdhci-am654.example.dt.yaml: mmc@4f80000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected) Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.example.dt.yaml: mmc@5a400000: Unevaluated properties are not allowed ('dma-names', 'dmas' were unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@80126000: Unevaluated properties are not allowed ('dmas', 'dma-names' were unexpected) Documentation/devicetree/bindings/mmc/arasan,sdhci.example.dt.yaml: mmc@80420000: Unevaluated properties are not allowed ('resets' was unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@52007000: Unevaluated properties are not allowed ('interrupt-names' was unexpected) Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: Unevaluated properties are not allowed ('power-domains' was unexpected)

Add the missing properties as necessary. For pl18x, drop interrupt-names as there isn't any use of it when there are 2 interrupts.

Cc Ulf Hansson <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Chaotian Jing <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Quoted 8 lines

Yours,
Linus Walleij

Reviewed-by on v1 1/1
#2 lore raw
In reply to Rob Herring
Quoted 125 lines · Rob Herring

When 'unevaluatedProperties' support is enabled, the following warnings are generated in the mmc bindings:

Documentation/devicetree/bindings/mmc/mtk-sd.example.dt.yaml: mmc@11230000: Unevaluated properties are not allowed ('reg', 'interrupts' were unexpected) Documentation/devicetree/bindings/mmc/sdhci-am654.example.dt.yaml: mmc@4f80000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected) Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.example.dt.yaml: mmc@5a400000: Unevaluated properties are not allowed ('dma-names', 'dmas' were unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@80126000: Unevaluated properties are not allowed ('dmas', 'dma-names' were unexpected) Documentation/devicetree/bindings/mmc/arasan,sdhci.example.dt.yaml: mmc@80420000: Unevaluated properties are not allowed ('resets' was unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@52007000: Unevaluated properties are not allowed ('interrupt-names' was unexpected) Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: Unevaluated properties are not allowed ('power-domains' was unexpected)

Add the missing properties as necessary. For pl18x, drop interrupt-names as there isn't any use of it when there are 2 interrupts.

Cc Ulf Hansson <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Chaotian Jing <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wenbin Mei <[email protected]>
Cc Masahiro Yamada <[email protected]>
---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml  | 3 +++
 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml     | 9 ++++++++-
 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 +++
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml        | 6 ++++++
 Documentation/devicetree/bindings/mmc/sdhci-am654.yaml   | 2 ++
 .../devicetree/bindings/mmc/socionext,uniphier-sd.yaml   | 6 ++++++
 6 files changed, 28 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml +3 -0
index de6f076e0ece..83be9e93d221 100644
@@ -118,6 +118,9 @@ properties:
   phy-names:
     const: phy_arasan
 
+  resets:
+    maxItems: 1
+
   arasan,soc-ctl-syscon:
     $ref: /schemas/types.yaml#/definitions/phandle
     description:
Documentation/devicetree/bindings/mmc/arm,pl18x.yaml +8 -1
index 47595cb483be..fbc866d9bb2f 100644
@@ -60,6 +60,14 @@ properties:
     minItems: 1
     maxItems: 2
 
+  dmas:
+    maxItems: 2
+
+  dma-names:
+    items:
+      - const: rx
+      - const: tx
+
   power-domains: true
 
   resets:
@@ -213,7 +221,6 @@ examples:
       arm,primecell-periphid = <0x10153180>;
       reg = <0x52007000 0x1000>;
       interrupts = <49>;
-      interrupt-names = "cmd_irq";
       clocks = <&rcc 0>;
       clock-names = "apb_pclk";
       resets = <&rcc 1>;
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +3 -0
index 19621a2f8beb..8d5cef0d3039 100644
@@ -116,6 +116,9 @@ properties:
       - const: ahb
       - const: per
 
+  power-domains:
+    maxItems: 1
+
   pinctrl-names:
     oneOf:
       - minItems: 3
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +6 -0
index 82768a807294..faf89b0c918f 100644
@@ -36,6 +36,9 @@ properties:
           - const: mediatek,mt8195-mmc
           - const: mediatek,mt8183-mmc
 
+  reg:
+    maxItems: 1
+
   clocks:
     description:
       Should contain phandle for the clock feeding the MMC controller.
@@ -62,6 +65,9 @@ properties:
       - const: axi_cg
       - const: ahb_cg
 
+  interrupts:
+    maxItems: 1
+
   pinctrl-names:
     items:
       - const: default
Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +0 -0
index 224303f5b913..9fbf16b3bc8d 100644

Documentation/devicetree/bindings/mmc/sdhci-am654.yaml properties: · line 51

Quoted 4 lines
Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +1 -0
@@ -48,6 +48,8 @@ properties:
       - const: clk_ahb
       - const: clk_xin
 
+  sdhci-caps-mask: true

I can take a stab at converting sdhci.txt if you don't have a patch for that yet. That way we can reference this one rather than blindly passing validation for it.

Otherwise looks good:

#3 lore raw
In reply to Rob Herring
Quoted 25 lines · Rob Herring

When 'unevaluatedProperties' support is enabled, the following warnings are generated in the mmc bindings:

Documentation/devicetree/bindings/mmc/mtk-sd.example.dt.yaml: mmc@11230000: Unevaluated properties are not allowed ('reg', 'interrupts' were unexpected) Documentation/devicetree/bindings/mmc/sdhci-am654.example.dt.yaml: mmc@4f80000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected) Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.example.dt.yaml: mmc@5a400000: Unevaluated properties are not allowed ('dma-names', 'dmas' were unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@80126000: Unevaluated properties are not allowed ('dmas', 'dma-names' were unexpected) Documentation/devicetree/bindings/mmc/arasan,sdhci.example.dt.yaml: mmc@80420000: Unevaluated properties are not allowed ('resets' was unexpected) Documentation/devicetree/bindings/mmc/arm,pl18x.example.dt.yaml: mmc@52007000: Unevaluated properties are not allowed ('interrupt-names' was unexpected) Documentation/devicetree/bindings/clock/imx8qxp-lpcg.example.dt.yaml: mmc@5b010000: Unevaluated properties are not allowed ('power-domains' was unexpected)

Add the missing properties as necessary. For pl18x, drop interrupt-names as there isn't any use of it when there are 2 interrupts.

Cc Ulf Hansson <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Chaotian Jing <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Quoted 8 lines

Applied for next, thanks!

Kind regards
Uffe

Quoted 121 lines
---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml  | 3 +++
 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml     | 9 ++++++++-
 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 +++
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml        | 6 ++++++
 Documentation/devicetree/bindings/mmc/sdhci-am654.yaml   | 2 ++
 .../devicetree/bindings/mmc/socionext,uniphier-sd.yaml   | 6 ++++++
 6 files changed, 28 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml +3 -0
index de6f076e0ece..83be9e93d221 100644
@@ -118,6 +118,9 @@ properties:
   phy-names:
     const: phy_arasan
 
+  resets:
+    maxItems: 1
+
   arasan,soc-ctl-syscon:
     $ref: /schemas/types.yaml#/definitions/phandle
     description:
Documentation/devicetree/bindings/mmc/arm,pl18x.yaml +8 -1
index 47595cb483be..fbc866d9bb2f 100644
@@ -60,6 +60,14 @@ properties:
     minItems: 1
     maxItems: 2
 
+  dmas:
+    maxItems: 2
+
+  dma-names:
+    items:
+      - const: rx
+      - const: tx
+
   power-domains: true
 
   resets:
@@ -213,7 +221,6 @@ examples:
       arm,primecell-periphid = <0x10153180>;
       reg = <0x52007000 0x1000>;
       interrupts = <49>;
-      interrupt-names = "cmd_irq";
       clocks = <&rcc 0>;
       clock-names = "apb_pclk";
       resets = <&rcc 1>;
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +3 -0
index 19621a2f8beb..8d5cef0d3039 100644
@@ -116,6 +116,9 @@ properties:
       - const: ahb
       - const: per
 
+  power-domains:
+    maxItems: 1
+
   pinctrl-names:
     oneOf:
       - minItems: 3
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +6 -0
index 82768a807294..faf89b0c918f 100644
@@ -36,6 +36,9 @@ properties:
           - const: mediatek,mt8195-mmc
           - const: mediatek,mt8183-mmc
 
+  reg:
+    maxItems: 1
+
   clocks:
     description:
       Should contain phandle for the clock feeding the MMC controller.
@@ -62,6 +65,9 @@ properties:
       - const: axi_cg
       - const: ahb_cg
 
+  interrupts:
+    maxItems: 1
+
   pinctrl-names:
     items:
       - const: default
Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +2 -0
index 224303f5b913..9fbf16b3bc8d 100644
@@ -48,6 +48,8 @@ properties:
       - const: clk_ahb
       - const: clk_xin
 
+  sdhci-caps-mask: true
+
   # PHY output tap delays:
   # Used to delay the data valid window and align it to the sampling clock.
   # Binding needs to be provided for each supported speed mode otherwise the
Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.yaml +6 -1
index 56f9ff12742d..a586fad0a46b 100644
@@ -26,6 +26,12 @@ properties:
   clocks:
     maxItems: 1
 
+  dmas:
+    maxItems: 1
+
+  dma-names:
+    const: rx-tx
+
   reset-names:
     description: |
       There are three reset signals at maximum
--

2.32.0