[PATCH v4 0/8] arm64: dts: convert fsl,esdhc.txt to yaml and fix layerscape dts warning

[PATCH v4 0/8] arm64: dts: convert fsl,esdhc.txt to yaml and fix layerscape dts warning

[Frank Li]

Start from v4 because fsl.esdhc.txt to yaml already sent out as v3.

Change from v3 to v4
- Add dts warning fixes
- Add mmc-spi-slot's voltage range fix, (not sure why it apply to
layserscape's dts file.
- clock-frequency is not required property
- add dma-conherence: true in binding doc

Now only "bit-endian" proptery warning left.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Frank Li (8):
      dt-bindings: mmc: Convert fsl-esdhc.txt to yaml
      dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix
      arm64: dts: ls1012a: Chang node name from 'esdhc' to 'mmc'
      arm64: dts: ls1043a: Chang node name from 'esdhc' to 'mmc'
      arm64: dts: ls1046a: Chang node name from 'esdhc' to 'mmc'
      arm64: dts: ls1088a: Chang node name from 'esdhc' to 'mmc'
      arm64: dts: ls208ax: Chang node name from 'esdhc' to 'mmc'
      arm64: dts: lx2160a: Chang node name from 'esdhc' to 'mmc'

 .../devicetree/bindings/mmc/fsl,esdhc.yaml         | 105 +++++++++++++++++++++
 .../devicetree/bindings/mmc/fsl-esdhc.txt          |  52 ----------
 .../devicetree/bindings/mmc/mmc-spi-slot.yaml      |  17 ++--
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |   4 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     |   8 +-
 9 files changed, 125 insertions(+), 69 deletions(-)
---
base-commit: d35b2284e966c0bef3e2182a5c5ea02177dd32e4
change-id: 20240610-ls_waring_esdhc-93136a5dd794

Best regards,
---
Frank Li <Frank.Li@nxp.com>

[PATCH v4 1/8] dt-bindings: mmc: Convert fsl-esdhc.txt to yaml

[Frank Li]

Convert layerscape fsl-esdhc binding doc from txt to yaml format.

Addtional change during convert:
- Deprecate "sdhci,wp-inverted", "sdhci,1-bit-only".
- Add "reg" and "interrupts" property.
- Change example "sdhci@2e000" to "mmc@2e000".
- Compatible string require fsl,<chip>-esdhc followed by fsl,esdhc to match
most existed dts file.
- Set clock-frequency to 100mhz in example.
- clock-frequency is not required now.
- Allow dma-coherence
- Add clocks

Signed-off-by: Frank Li <Frank.Li@nxp.com>

---
Change from v3 to v4
    - Remove clock-frequency from required
    - Add dma-coherence
    - Add clocks
    - Not add Krzysztof Kozlowski review tag because some additional change.

Change from v2 to v3
    - add minItems and maxItems for voltage-ranges

    Change from v1 to v2
    - use filename fsl,esdhc.yaml
    - Add clock-frequency to required
    - change clock-frequency to 100mhz in example

    pass dt_binding_check
    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8  dt_binding_check DT_SCHEMA_FILES=fsl,esdhc.yaml
      SCHEMA  Documentation/devicetree/bindings/processed-schema.json
      CHKDT   Documentation/devicetree/bindings
      LINT    Documentation/devicetree/bindings
      DTEX    Documentation/devicetree/bindings/mmc/fsl-ls-esdhc.example.dts
      DTC_CHK Documentation/devicetree/bindings/mmc/fsl-ls-esdhc.example.dtb
---
 .../devicetree/bindings/mmc/fsl,esdhc.yaml         | 105 +++++++++++++++++++++
 .../devicetree/bindings/mmc/fsl-esdhc.txt          |  52 ----------
 2 files changed, 105 insertions(+), 52 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml
new file mode 100644
index 0000000000000..b86ffb53b18b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml
@@ -0,0 +1,105 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Freescale Enhanced Secure Digital Host Controller (eSDHC)
+
+description:
+  The Enhanced Secure Digital Host Controller provides an interface
+  for MMC, SD, and SDIO types of memory cards.
+
+maintainers:
+  - Frank Li <Frank.Li@nxp.com>
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - fsl,mpc8536-esdhc
+          - fsl,mpc8378-esdhc
+          - fsl,p2020-esdhc
+          - fsl,p4080-esdhc
+          - fsl,t1040-esdhc
+          - fsl,t4240-esdhc
+          - fsl,ls1012a-esdhc
+          - fsl,ls1028a-esdhc
+          - fsl,ls1088a-esdhc
+          - fsl,ls1043a-esdhc
+          - fsl,ls1046a-esdhc
+          - fsl,ls2080a-esdhc
+      - const: fsl,esdhc
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  clock-frequency:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: specifies eSDHC base clock frequency.
+
+  sdhci,wp-inverted:
+    $ref: /schemas/types.yaml#/definitions/flag
+    deprecated: true
+    description:
+      specifies that eSDHC controller reports
+      inverted write-protect state; New devices should use the generic
+      "wp-inverted" property.
+
+  sdhci,1-bit-only:
+    $ref: /schemas/types.yaml#/definitions/flag
+    deprecated: true
+    description:
+      specifies that a controller can only handle
+      1-bit data transfers. New devices should use the generic
+      "bus-width = <1>" property.
+
+  sdhci,auto-cmd12:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      specifies that a controller can only handle auto CMD12.
+
+  voltage-ranges:
+    $ref: /schemas/types.yaml#/definitions/uint32-matrix
+    items:
+      items:
+        - description: specifies minimum slot voltage (mV).
+        - description: specifies maximum slot voltage (mV).
+    minItems: 1
+    maxItems: 8
+
+  dma-coherent: true
+
+  little-endian:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      If the host controller is little-endian mode, specify
+      this property. The default endian mode is big-endian.
+
+required:
+  - compatible
+  - reg
+  - interrupts
+
+allOf:
+  - $ref: sdhci-common.yaml#
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    mmc@2e000 {
+        compatible = "fsl,mpc8378-esdhc", "fsl,esdhc";
+        reg = <0x2e000 0x1000>;
+        interrupts = <42 0x8>;
+        interrupt-parent = <&ipic>;
+        /* Filled in by U-Boot */
+        clock-frequency = <100000000>;
+        voltage-ranges = <3300 3300>;
+    };
diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
deleted file mode 100644
index edb8cadb95412..0000000000000
--- a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-* Freescale Enhanced Secure Digital Host Controller (eSDHC)
-
-The Enhanced Secure Digital Host Controller provides an interface
-for MMC, SD, and SDIO types of memory cards.
-
-This file documents differences between the core properties described
-by mmc.txt and the properties used by the sdhci-esdhc driver.
-
-Required properties:
-  - compatible : should be "fsl,esdhc", or "fsl,<chip>-esdhc".
-    Possible compatibles for PowerPC:
-	"fsl,mpc8536-esdhc"
-	"fsl,mpc8378-esdhc"
-	"fsl,p2020-esdhc"
-	"fsl,p4080-esdhc"
-	"fsl,t1040-esdhc"
-	"fsl,t4240-esdhc"
-    Possible compatibles for ARM:
-	"fsl,ls1012a-esdhc"
-	"fsl,ls1028a-esdhc"
-	"fsl,ls1088a-esdhc"
-	"fsl,ls1043a-esdhc"
-	"fsl,ls1046a-esdhc"
-	"fsl,ls2080a-esdhc"
-  - clock-frequency : specifies eSDHC base clock frequency.
-
-Optional properties:
-  - sdhci,wp-inverted : specifies that eSDHC controller reports
-    inverted write-protect state; New devices should use the generic
-    "wp-inverted" property.
-  - sdhci,1-bit-only : specifies that a controller can only handle
-    1-bit data transfers. New devices should use the generic
-    "bus-width = <1>" property.
-  - sdhci,auto-cmd12: specifies that a controller can only handle auto
-    CMD12.
-  - voltage-ranges : two cells are required, first cell specifies minimum
-    slot voltage (mV), second cell specifies maximum slot voltage (mV).
-    Several ranges could be specified.
-  - little-endian : If the host controller is little-endian mode, specify
-    this property. The default endian mode is big-endian.
-
-Example:
-
-sdhci@2e000 {
-	compatible = "fsl,mpc8378-esdhc", "fsl,esdhc";
-	reg = <0x2e000 0x1000>;
-	interrupts = <42 0x8>;
-	interrupt-parent = <&ipic>;
-	/* Filled in by U-Boot */
-	clock-frequency = <0>;
-	voltage-ranges = <3300 3300>;
-};

-- 
2.34.1

Re: [PATCH v4 1/8] dt-bindings: mmc: Convert fsl-esdhc.txt to yaml

[Krzysztof Kozlowski]

On 11/06/2024 18:01, Frank Li wrote:
> Convert layerscape fsl-esdhc binding doc from txt to yaml format.
> 
> Addtional change during convert:
> - Deprecate "sdhci,wp-inverted", "sdhci,1-bit-only".
> - Add "reg" and "interrupts" property.
> - Change example "sdhci@2e000" to "mmc@2e000".
> - Compatible string require fsl,<chip>-esdhc followed by fsl,esdhc to match
> most existed dts file.
> - Set clock-frequency to 100mhz in example.
> - clock-frequency is not required now.
> - Allow dma-coherence
> - Add clocks
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> 

This should be reversed with the second patch, because first you fix
voltage-ranges to the same type, then you use it.

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

Best regards,
Krzysztof

[PATCH v4 2/8] dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix

[Frank Li]

According to common mmc core, voltages-ranges should be matrix.

Signed-off-by: Frank Li <Frank.Li@nxp.com>

---
Not sure why it impact other mmc yaml's voltage-ranges.
---
 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
index 36acc40c7d181..05815b837219d 100644
--- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
+++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
@@ -27,17 +27,20 @@ properties:
     maxItems: 1
 
   voltage-ranges:
-    $ref: /schemas/types.yaml#/definitions/uint32-array
+    $ref: /schemas/types.yaml#/definitions/uint32-matrix
     description: |
       Two cells are required, first cell specifies minimum slot voltage (mV),
       second cell specifies maximum slot voltage (mV).
     items:
-      - description: |
-          value for minimum slot voltage in mV
-        default: 3200
-      - description: |
-          value for maximum slot voltage in mV
-        default: 3400
+      items:
+        - description: |
+            value for minimum slot voltage in mV
+          default: 3200
+        - description: |
+            value for maximum slot voltage in mV
+          default: 3400
+    minItems: 1
+    maxItems: 8
 
   gpios:
     description: |

-- 
2.34.1

Re: [PATCH v4 2/8] dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix

[Rob Herring]

On Tue, Jun 11, 2024 at 12:01:47PM -0400, Frank Li wrote:
> According to common mmc core, voltages-ranges should be matrix.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> 
> ---
> Not sure why it impact other mmc yaml's voltage-ranges.

It's a quirk of the tools. When decoding properties, the tools only know 
all possible types. Types are global, not per binding. Sometimes it can 
be figured out, but cases like this cannot be.

> ---
>  Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> index 36acc40c7d181..05815b837219d 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> @@ -27,17 +27,20 @@ properties:
>      maxItems: 1
>  
>    voltage-ranges:
> -    $ref: /schemas/types.yaml#/definitions/uint32-array
> +    $ref: /schemas/types.yaml#/definitions/uint32-matrix
>      description: |
>        Two cells are required, first cell specifies minimum slot voltage (mV),
>        second cell specifies maximum slot voltage (mV).
>      items:
> -      - description: |
> -          value for minimum slot voltage in mV
> -        default: 3200
> -      - description: |
> -          value for maximum slot voltage in mV
> -        default: 3400
> +      items:
> +        - description: |
> +            value for minimum slot voltage in mV
> +          default: 3200
> +        - description: |
> +            value for maximum slot voltage in mV
> +          default: 3400
> +    minItems: 1
> +    maxItems: 8

From what I remember, SPI mode doesn't support voltage changes. 
Switching to 1.8V came much later in the spec. So it should be 
'maxItems: 1'. Or better yet, make the outer 'items' a list (of 1 
entry).

Rob

Re: [PATCH v4 2/8] dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix

[Frank Li]

On Tue, Jun 11, 2024 at 02:23:11PM -0600, Rob Herring wrote:
> On Tue, Jun 11, 2024 at 12:01:47PM -0400, Frank Li wrote:
> > According to common mmc core, voltages-ranges should be matrix.
> > 
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > 
> > ---
> > Not sure why it impact other mmc yaml's voltage-ranges.
> 
> It's a quirk of the tools. When decoding properties, the tools only know 
> all possible types. Types are global, not per binding. Sometimes it can 
> be figured out, but cases like this cannot be.
> 
> > ---
> >  Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml | 17 ++++++++++-------
> >  1 file changed, 10 insertions(+), 7 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> > index 36acc40c7d181..05815b837219d 100644
> > --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> > +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> > @@ -27,17 +27,20 @@ properties:
> >      maxItems: 1
> >  
> >    voltage-ranges:
> > -    $ref: /schemas/types.yaml#/definitions/uint32-array
> > +    $ref: /schemas/types.yaml#/definitions/uint32-matrix
> >      description: |
> >        Two cells are required, first cell specifies minimum slot voltage (mV),
> >        second cell specifies maximum slot voltage (mV).
> >      items:
> > -      - description: |
> > -          value for minimum slot voltage in mV
> > -        default: 3200
> > -      - description: |
> > -          value for maximum slot voltage in mV
> > -        default: 3400
> > +      items:
> > +        - description: |
> > +            value for minimum slot voltage in mV
> > +          default: 3200
> > +        - description: |
> > +            value for maximum slot voltage in mV
> > +          default: 3400
> > +    minItems: 1
> > +    maxItems: 8
> 
> From what I remember, SPI mode doesn't support voltage changes. 
> Switching to 1.8V came much later in the spec. So it should be 
> 'maxItems: 1'. Or better yet, make the outer 'items' a list (of 1 
> entry).

I don't understand "make the outer 'items' a list (of 1 entry)." Can guide
me how to write it?

Frank 

> 
> Rob

Re: [PATCH v4 2/8] dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix

[Krzysztof Kozlowski]

On 12/06/2024 16:36, Frank Li wrote:
> On Tue, Jun 11, 2024 at 02:23:11PM -0600, Rob Herring wrote:
>> On Tue, Jun 11, 2024 at 12:01:47PM -0400, Frank Li wrote:
>>> According to common mmc core, voltages-ranges should be matrix.
>>>
>>> Signed-off-by: Frank Li <Frank.Li@nxp.com>
>>>
>>> ---
>>> Not sure why it impact other mmc yaml's voltage-ranges.
>>
>> It's a quirk of the tools. When decoding properties, the tools only know 
>> all possible types. Types are global, not per binding. Sometimes it can 
>> be figured out, but cases like this cannot be.
>>
>>> ---
>>>  Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml | 17 ++++++++++-------
>>>  1 file changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
>>> index 36acc40c7d181..05815b837219d 100644
>>> --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
>>> +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
>>> @@ -27,17 +27,20 @@ properties:
>>>      maxItems: 1
>>>  
>>>    voltage-ranges:
>>> -    $ref: /schemas/types.yaml#/definitions/uint32-array
>>> +    $ref: /schemas/types.yaml#/definitions/uint32-matrix
>>>      description: |
>>>        Two cells are required, first cell specifies minimum slot voltage (mV),
>>>        second cell specifies maximum slot voltage (mV).
>>>      items:
>>> -      - description: |
>>> -          value for minimum slot voltage in mV
>>> -        default: 3200
>>> -      - description: |
>>> -          value for maximum slot voltage in mV
>>> -        default: 3400
>>> +      items:
>>> +        - description: |
>>> +            value for minimum slot voltage in mV
>>> +          default: 3200
>>> +        - description: |
>>> +            value for maximum slot voltage in mV
>>> +          default: 3400
>>> +    minItems: 1
>>> +    maxItems: 8
>>
>> From what I remember, SPI mode doesn't support voltage changes. 
>> Switching to 1.8V came much later in the spec. So it should be 
>> 'maxItems: 1'. Or better yet, make the outer 'items' a list (of 1 
>> entry).
> 
> I don't understand "make the outer 'items' a list (of 1 entry)." Can guide
> me how to write it?

voltage-ranges:
  $ref: /schemas/types.yaml#/definitions/uint32-matrix
  items:
    - items:
        - descr:
        - descr:

Best regards,
Krzysztof

[PATCH v4 3/8] arm64: dts: ls1012a: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' to fix DTB_CHECK warning.

arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dtb: esdhc@1560000: $nodename:0: 'esdhc@1560000' does not match '^mmc(@.*)?$'
	from schema $id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index a0f7bbd691a00..7f8c83670ca86 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -156,7 +156,7 @@ QORIQ_CLK_PLL_DIV(1)>,
 			status = "disabled";
 		};
 
-		esdhc0: esdhc@1560000 {
+		esdhc0: mmc@1560000 {
 			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x1560000 0x0 0x10000>;
 			interrupts = <0 62 0x4>;
@@ -175,7 +175,7 @@ scfg: scfg@1570000 {
 			big-endian;
 		};
 
-		esdhc1: esdhc@1580000 {
+		esdhc1: mmc@1580000 {
 			compatible = "fsl,ls1012a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x1580000 0x0 0x10000>;
 			interrupts = <0 65 0x4>;

-- 
2.34.1

[PATCH v4 4/8] arm64: dts: ls1043a: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' to fix DTB_CHECK warning.

arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dtb: esdhc@1560000: $nodename:0: 'esdhc@1560000' does not match '^mmc(@.*)?$'
	from schema $id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 8ee6d8c0ef619..3eeed7290be9e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -424,7 +424,7 @@ QORIQ_CLK_PLL_DIV(1)>,
 			status = "disabled";
 		};
 
-		esdhc: esdhc@1560000 {
+		esdhc: mmc@1560000 {
 			compatible = "fsl,ls1043a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x1560000 0x0 0x10000>;
 			interrupts = <0 62 0x4>;

-- 
2.34.1

[PATCH v4 5/8] arm64: dts: ls1046a: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' to fix DTB_CHECK warning.
    arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dtb: esdhc@1560000: $nodename:0: 'esdhc@1560000' does not match '^mmc(@.*)?$'

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 754a64be739cf..4d65093341774 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -308,7 +308,7 @@ QORIQ_CLK_PLL_DIV(2)>,
 			status = "disabled";
 		};
 
-		esdhc: esdhc@1560000 {
+		esdhc: mmc@1560000 {
 			compatible = "fsl,ls1046a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x1560000 0x0 0x10000>;
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

-- 
2.34.1

[PATCH v4 6/8] arm64: dts: ls1088a: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' to fix DTB_CHECK warning.

arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dtb: esdhc@2140000: $nodename:0: 'esdhc@2140000' does not match '^mmc(@.*)?$'

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 604bf88d70b3a..20f331dc28f13 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -474,7 +474,7 @@ QORIQ_CLK_PLL_DIV(4)>,
 			status = "disabled";
 		};
 
-		esdhc: esdhc@2140000 {
+		esdhc: mmc@2140000 {
 			compatible = "fsl,ls1088a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x2140000 0x0 0x10000>;
 			interrupts = <0 28 0x4>; /* Level high type */

-- 
2.34.1

[PATCH v4 7/8] arm64: dts: ls208ax: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' to fix DTB_CHECK warning.

arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dtb: esdhc@2140000: $nodename:0: 'esdhc@2140000' does not match '^mmc(@.*)?$'

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index ccba0a135b247..80fd1420d2299 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -940,7 +940,7 @@ dspi: spi@2100000 {
 			spi-num-chipselects = <5>;
 		};
 
-		esdhc: esdhc@2140000 {
+		esdhc: mmc@2140000 {
 			status = "disabled";
 			compatible = "fsl,ls2080a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x2140000 0x0 0x10000>;

-- 
2.34.1

[PATCH v4 8/8] arm64: dts: lx2160a: Chang node name from 'esdhc' to 'mmc'

[Frank Li]

Use common node name 'mmc' and to add compatible string 'fsl,ls2080a-esdhc'
to fix DTB_CHECK waring.
arch/arm64/boot/dts/freescale/fsl-lx2160a-honeycomb.dtb: esdhc@2140000: compatible:0: 'fsl,esdhc' is not one of ['fsl,mpc8536-esdhc', 'fsl,mpc8378-esdhc', 'fsl,p2020-esdhc', 'fsl,p4080-esdhc', 'fsl,t1040-esdhc', 'fsl,t4240-esdhc', 'fsl,ls1012a-esdhc', 'fsl,ls1028a-esdhc', 'fsl,ls1088a-esdhc', 'fsl,ls1043a-esdhc', 'fsl,ls1046a-esdhc', 'fsl,ls2080a-esdhc']
        from schema $id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#
arch/arm64/boot/dts/freescale/fsl-lx2160a-honeycomb.dtb: esdhc@2140000: $nodename:0: 'esdhc@2140000' does not match '^mmc(@.*)?$'

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
index 96055593204ab..742de15bbfd87 100644
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -925,8 +925,8 @@ dspi2: spi@2120000 {
 			status = "disabled";
 		};
 
-		esdhc0: esdhc@2140000 {
-			compatible = "fsl,esdhc";
+		esdhc0: mmc@2140000 {
+			compatible = "fsl,ls2080a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x2140000 0x0 0x10000>;
 			interrupts = <0 28 0x4>; /* Level high type */
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
@@ -939,8 +939,8 @@ esdhc0: esdhc@2140000 {
 			status = "disabled";
 		};
 
-		esdhc1: esdhc@2150000 {
-			compatible = "fsl,esdhc";
+		esdhc1: mmc@2150000 {
+			compatible = "fsl,ls2080a-esdhc", "fsl,esdhc";
 			reg = <0x0 0x2150000 0x0 0x10000>;
 			interrupts = <0 63 0x4>; /* Level high type */
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

-- 
2.34.1

Re: [PATCH v4 0/8] arm64: dts: convert fsl,esdhc.txt to yaml and fix layerscape dts warning

[Dragan Simic]

Hello Frank,

Please see my comment below.

On 2024-06-11 18:01, Frank Li wrote:
> Start from v4 because fsl.esdhc.txt to yaml already sent out as v3.
> 
> Change from v3 to v4
> - Add dts warning fixes
> - Add mmc-spi-slot's voltage range fix, (not sure why it apply to
> layserscape's dts file.
> - clock-frequency is not required property
> - add dma-conherence: true in binding doc
> 
> Now only "bit-endian" proptery warning left.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
> Frank Li (8):
>       dt-bindings: mmc: Convert fsl-esdhc.txt to yaml
>       dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to 
> uint32-matrix
>       arm64: dts: ls1012a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1043a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1046a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1088a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls208ax: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: lx2160a: Chang node name from 'esdhc' to 'mmc'

s/Chang /Change / -- in all patch subjects

>  .../devicetree/bindings/mmc/fsl,esdhc.yaml         | 105 
> +++++++++++++++++++++
>  .../devicetree/bindings/mmc/fsl-esdhc.txt          |  52 ----------
>  .../devicetree/bindings/mmc/mmc-spi-slot.yaml      |  17 ++--
>  arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |   4 +-
>  arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |   2 +-
>  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |   2 +-
>  arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |   2 +-
>  arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |   2 +-
>  arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     |   8 +-
>  9 files changed, 125 insertions(+), 69 deletions(-)
> ---
> base-commit: d35b2284e966c0bef3e2182a5c5ea02177dd32e4
> change-id: 20240610-ls_waring_esdhc-93136a5dd794
> 
> Best regards,
> ---
> Frank Li <Frank.Li@nxp.com>

Re: [PATCH v4 0/8] arm64: dts: convert fsl,esdhc.txt to yaml and fix layerscape dts warning

[Rob Herring]

On Tue, Jun 11, 2024 at 12:01:45PM -0400, Frank Li wrote:
> Start from v4 because fsl.esdhc.txt to yaml already sent out as v3.
> 
> Change from v3 to v4
> - Add dts warning fixes
> - Add mmc-spi-slot's voltage range fix, (not sure why it apply to
> layserscape's dts file.
> - clock-frequency is not required property
> - add dma-conherence: true in binding doc
> 
> Now only "bit-endian" proptery warning left.
> 
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
> Frank Li (8):
>       dt-bindings: mmc: Convert fsl-esdhc.txt to yaml
>       dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix

>       arm64: dts: ls1012a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1043a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1046a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls1088a: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: ls208ax: Chang node name from 'esdhc' to 'mmc'
>       arm64: dts: lx2160a: Chang node name from 'esdhc' to 'mmc'

It is all the same change to the same maintainer, so these can be just 
one patch. Then you just have 1 typo to fix.

Rob

Re: [PATCH v4 0/8] arm64: dts: convert fsl,esdhc.txt to yaml and fix layerscape dts warning

[Krzysztof Kozlowski]

On 11/06/2024 22:16, Rob Herring wrote:
> On Tue, Jun 11, 2024 at 12:01:45PM -0400, Frank Li wrote:
>> Start from v4 because fsl.esdhc.txt to yaml already sent out as v3.
>>
>> Change from v3 to v4
>> - Add dts warning fixes
>> - Add mmc-spi-slot's voltage range fix, (not sure why it apply to
>> layserscape's dts file.
>> - clock-frequency is not required property
>> - add dma-conherence: true in binding doc
>>
>> Now only "bit-endian" proptery warning left.
>>
>> Signed-off-by: Frank Li <Frank.Li@nxp.com>
>> ---
>> Frank Li (8):
>>       dt-bindings: mmc: Convert fsl-esdhc.txt to yaml
>>       dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix
> 
>>       arm64: dts: ls1012a: Chang node name from 'esdhc' to 'mmc'
>>       arm64: dts: ls1043a: Chang node name from 'esdhc' to 'mmc'
>>       arm64: dts: ls1046a: Chang node name from 'esdhc' to 'mmc'
>>       arm64: dts: ls1088a: Chang node name from 'esdhc' to 'mmc'
>>       arm64: dts: ls208ax: Chang node name from 'esdhc' to 'mmc'
>>       arm64: dts: lx2160a: Chang node name from 'esdhc' to 'mmc'
> 
> It is all the same change to the same maintainer, so these can be just 
> one patch. Then you just have 1 typo to fix.

Yeah, considering that this is trivial node name alignment, so rather
style issue.

Best regards,
Krzysztof