devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings
@ 2025-03-20 21:35 Rob Herring (Arm)
  2025-03-20 21:35 ` [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus" Rob Herring (Arm)
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Rob Herring (Arm) @ 2025-03-20 21:35 UTC (permalink / raw)
  To: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley
  Cc: linux-mmc, devicetree, linux-kernel

This small series fixes several validation warnings caused by the 
marvell,xenon-sdhci binding:

marvell: mmc@6e0000: clocks: [[4, 4]] is too short
marvell: mmc@6e0000: clock-names: ['core'] is too short
marvell: mmc@780000: Unevaluated properties are not allowed ('dma-coherent' was unexpected)
marvell: mmc@780000: Unevaluated properties are not allowed ('dma-coherent', 'iommus' were unexpected)
marvell: mmc@d0000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected)

Signed-off-by: "Rob Herring (Arm)" <robh@kernel.org>
---
Rob Herring (Arm) (3):
      dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus"
      dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml
      dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks

 .../bindings/mmc/marvell,xenon-sdhci.yaml          | 27 +++++-----------------
 1 file changed, 6 insertions(+), 21 deletions(-)
---
base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
change-id: 20250320-dt-marvell-mmc-443bd0060974

Best regards,
-- 
Rob Herring (Arm) <robh@kernel.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus"
  2025-03-20 21:35 [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Rob Herring (Arm)
@ 2025-03-20 21:35 ` Rob Herring (Arm)
  2025-03-26  8:13   ` Krzysztof Kozlowski
  2025-03-20 21:35 ` [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml Rob Herring (Arm)
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Rob Herring (Arm) @ 2025-03-20 21:35 UTC (permalink / raw)
  To: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley
  Cc: linux-mmc, devicetree, linux-kernel

The Marvell xenon-sdhci block can be cache-coherent and needs the
"dma-coherent" property. It can also be behind an IOMMU and needs the
"iommus" property.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index 3f48d8292d5b..259f465ea369 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -52,9 +52,14 @@ properties:
       - const: core
       - const: axi
 
+  dma-coherent: true
+
   interrupts:
     maxItems: 1
 
+  iommus:
+    maxItems: 1
+
   marvell,pad-type:
     $ref: /schemas/types.yaml#/definitions/string
     enum:

-- 
2.47.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml
  2025-03-20 21:35 [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Rob Herring (Arm)
  2025-03-20 21:35 ` [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus" Rob Herring (Arm)
@ 2025-03-20 21:35 ` Rob Herring (Arm)
  2025-03-26  8:13   ` Krzysztof Kozlowski
  2025-03-20 21:35 ` [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks Rob Herring (Arm)
  2025-04-07 16:04 ` [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Ulf Hansson
  3 siblings, 1 reply; 8+ messages in thread
From: Rob Herring (Arm) @ 2025-03-20 21:35 UTC (permalink / raw)
  To: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley
  Cc: linux-mmc, devicetree, linux-kernel

The Marvell xenon-sdhci block is an SDHCI and can use properties from
sdhci-common.yaml, so change the reference.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index 259f465ea369..e7df7a2a0331 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -147,7 +147,7 @@ properties:
       This property provides the re-tuning counter.
 
 allOf:
-  - $ref: mmc-controller.yaml#
+  - $ref: sdhci-common.yaml#
   - if:
       properties:
         compatible:

-- 
2.47.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks
  2025-03-20 21:35 [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Rob Herring (Arm)
  2025-03-20 21:35 ` [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus" Rob Herring (Arm)
  2025-03-20 21:35 ` [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml Rob Herring (Arm)
@ 2025-03-20 21:35 ` Rob Herring (Arm)
  2025-03-26  8:14   ` Krzysztof Kozlowski
  2025-04-07 16:04 ` [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Ulf Hansson
  3 siblings, 1 reply; 8+ messages in thread
From: Rob Herring (Arm) @ 2025-03-20 21:35 UTC (permalink / raw)
  To: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley
  Cc: linux-mmc, devicetree, linux-kernel

The "axi" clock is optional on at least the "marvell,armada-ap806-sdhci"
variant. Not sure what's correct here, so just drop the constraint.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index e7df7a2a0331..ee2ddef36369 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -169,26 +169,6 @@ allOf:
 
         marvell,pad-type: false
 
-  - if:
-      properties:
-        compatible:
-          contains:
-            enum:
-              - marvell,armada-cp110-sdhci
-              - marvell,armada-ap807-sdhci
-              - marvell,armada-ap806-sdhci
-
-    then:
-      properties:
-        clocks:
-          minItems: 2
-
-        clock-names:
-          items:
-            - const: core
-            - const: axi
-
-
 required:
   - compatible
   - reg

-- 
2.47.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus"
  2025-03-20 21:35 ` [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus" Rob Herring (Arm)
@ 2025-03-26  8:13   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2025-03-26  8:13 UTC (permalink / raw)
  To: Rob Herring (Arm)
  Cc: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley,
	linux-mmc, devicetree, linux-kernel

On Thu, Mar 20, 2025 at 04:35:46PM -0500, Rob Herring (Arm) wrote:
> The Marvell xenon-sdhci block can be cache-coherent and needs the
> "dma-coherent" property. It can also be behind an IOMMU and needs the
> "iommus" property.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>  Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 5 +++++
>  1 file changed, 5 insertions(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml
  2025-03-20 21:35 ` [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml Rob Herring (Arm)
@ 2025-03-26  8:13   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2025-03-26  8:13 UTC (permalink / raw)
  To: Rob Herring (Arm)
  Cc: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley,
	linux-mmc, devicetree, linux-kernel

On Thu, Mar 20, 2025 at 04:35:47PM -0500, Rob Herring (Arm) wrote:
> The Marvell xenon-sdhci block is an SDHCI and can use properties from
> sdhci-common.yaml, so change the reference.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>  Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks
  2025-03-20 21:35 ` [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks Rob Herring (Arm)
@ 2025-03-26  8:14   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2025-03-26  8:14 UTC (permalink / raw)
  To: Rob Herring (Arm)
  Cc: Hu Ziji, Ulf Hansson, Krzysztof Kozlowski, Conor Dooley,
	linux-mmc, devicetree, linux-kernel

On Thu, Mar 20, 2025 at 04:35:48PM -0500, Rob Herring (Arm) wrote:
> The "axi" clock is optional on at least the "marvell,armada-ap806-sdhci"
> variant. Not sure what's correct here, so just drop the constraint.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>  .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 20 --------------------
>  1 file changed, 20 deletions(-)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings
  2025-03-20 21:35 [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Rob Herring (Arm)
                   ` (2 preceding siblings ...)
  2025-03-20 21:35 ` [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks Rob Herring (Arm)
@ 2025-04-07 16:04 ` Ulf Hansson
  3 siblings, 0 replies; 8+ messages in thread
From: Ulf Hansson @ 2025-04-07 16:04 UTC (permalink / raw)
  To: Rob Herring (Arm)
  Cc: Hu Ziji, Krzysztof Kozlowski, Conor Dooley, linux-mmc, devicetree,
	linux-kernel

On Thu, 20 Mar 2025 at 22:36, Rob Herring (Arm) <robh@kernel.org> wrote:
>
> This small series fixes several validation warnings caused by the
> marvell,xenon-sdhci binding:
>
> marvell: mmc@6e0000: clocks: [[4, 4]] is too short
> marvell: mmc@6e0000: clock-names: ['core'] is too short
> marvell: mmc@780000: Unevaluated properties are not allowed ('dma-coherent' was unexpected)
> marvell: mmc@780000: Unevaluated properties are not allowed ('dma-coherent', 'iommus' were unexpected)
> marvell: mmc@d0000: Unevaluated properties are not allowed ('sdhci-caps-mask' was unexpected)
>
> Signed-off-by: "Rob Herring (Arm)" <robh@kernel.org>
> ---
> Rob Herring (Arm) (3):
>       dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus"
>       dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml
>       dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks
>
>  .../bindings/mmc/marvell,xenon-sdhci.yaml          | 27 +++++-----------------
>  1 file changed, 6 insertions(+), 21 deletions(-)
> ---
> base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
> change-id: 20250320-dt-marvell-mmc-443bd0060974
>
> Best regards,
> --
> Rob Herring (Arm) <robh@kernel.org>
>

Applied for next, thanks!

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-04-07 16:05 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-20 21:35 [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Rob Herring (Arm)
2025-03-20 21:35 ` [PATCH 1/3] dt-bindings: mmc: marvell,xenon-sdhci: Allow "dma-coherent" and "iommus" Rob Herring (Arm)
2025-03-26  8:13   ` Krzysztof Kozlowski
2025-03-20 21:35 ` [PATCH 2/3] dt-bindings: mmc: marvell,xenon-sdhci: Add reference to sdhci-common.yaml Rob Herring (Arm)
2025-03-26  8:13   ` Krzysztof Kozlowski
2025-03-20 21:35 ` [PATCH 3/3] dt-bindings: mmc: marvell,xenon-sdhci: Drop requiring 2 clocks Rob Herring (Arm)
2025-03-26  8:14   ` Krzysztof Kozlowski
2025-04-07 16:04 ` [PATCH 0/3] dt-bindings: mmc: marvell,xenon-sdhci: Fix several validation warnings Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).