[PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Charan Pedumuru]

Convert TI MMC host controller binding to YAML format.
Changes during Conversion:
- Add new properties 'dma', 'dma-names' under required.
- Define two separate phandles for 'dmas' in the examples.
- Include appropriate header file for interrupts and use
  it in the examples.

Signed-off-by: Charan Pedumuru <charan.pedumuru@gmail.com>
---
Changes in v2:
- Added include statement for irq interrupt controller and
  modified the interrupts under property to use header.
- Changed maintainer to Rob Herring.
- Defined two seperate phandles for 'dmas' under examples.
- Rename the YAML file name to the compatible 'ti,omap2420-mmc'.
- Added missing type and maxItems to 'ti,hwmods' under properties.
- Link to v1: https://lore.kernel.org/r/20250510-ti-omap-v1-1-588b0ccb1823@gmail.com
---
 .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml   | 64 ++++++++++++++++++++++
 Documentation/devicetree/bindings/mmc/ti-omap.txt  | 26 ---------
 2 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..195db77e0063b867f318ffc6b5f8811adb531515
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/ti,omap2420-mmc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: TI MMC host controller for OMAP1 and 2420
+
+description:
+  The MMC Host controller for TI OMAP1 and 2420 family provides
+  an interface for MMC, SD and SDIO types of memory cards.
+
+allOf:
+  - $ref: mmc-controller.yaml
+
+maintainers:
+  - Rob Herring <robh@kernel.org>
+
+properties:
+  compatible:
+    const: ti,omap2420-mmc
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  dmas:
+    maxItems: 2
+
+  dma-names:
+    items:
+      - const: tx
+      - const: rx
+
+  ti,hwmods:
+    maxItems: 1
+    items:
+      type: string
+      pattern: "^msdi[0-9]+$"
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - dmas
+  - dma-names
+  - ti,hwmods
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    mmc@4809c000 {
+        compatible = "ti,omap2420-mmc";
+        ti,hwmods = "msdi1";
+        reg = <0x4809c000 0x80>;
+        interrupts = <83 IRQ_TYPE_LEVEL_HIGH>;
+        dmas = <&sdma 61>, <&sdma 62>;
+        dma-names = "tx", "rx";
+    };
+...
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap.txt b/Documentation/devicetree/bindings/mmc/ti-omap.txt
deleted file mode 100644
index 02fd31cf361d6ed893ec2f9eb8368b358ab2bae1..0000000000000000000000000000000000000000
--- a/Documentation/devicetree/bindings/mmc/ti-omap.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-* TI MMC host controller for OMAP1 and 2420
-
-The MMC Host Controller on TI OMAP1 and 2420 family 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 omap mmc driver.
-
-Note that this driver will not work with omap2430 or later omaps,
-please see the omap hsmmc driver for the current omaps.
-
-Required properties:
-- compatible: Must be "ti,omap2420-mmc", for OMAP2420 controllers
-- ti,hwmods: For 2420, must be "msdi<n>", where n is controller
-  instance starting 1
-
-Examples:
-
-	msdi1: mmc@4809c000 {
-		compatible = "ti,omap2420-mmc";
-		ti,hwmods = "msdi1";
-		reg = <0x4809c000 0x80>;
-		interrupts = <83>;
-		dmas = <&sdma 61 &sdma 62>;
-		dma-names = "tx", "rx";
-	};

---
base-commit: 3e039dcc9c1320c0d33ddd51c372dcc91d3ea3c7
change-id: 20250502-ti-omap-12655fa9db3e

Best regards,
-- 
Charan Pedumuru <charan.pedumuru@gmail.com>

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 2214 bytes --]

On Mon, May 19, 2025 at 01:11:17PM +0000, Charan Pedumuru wrote:
> Convert TI MMC host controller binding to YAML format.
> Changes during Conversion:
> - Add new properties 'dma', 'dma-names' under required.
> - Define two separate phandles for 'dmas' in the examples.
> - Include appropriate header file for interrupts and use
>   it in the examples.
> 
> Signed-off-by: Charan Pedumuru <charan.pedumuru@gmail.com>
> ---
> Changes in v2:
> - Added include statement for irq interrupt controller and
>   modified the interrupts under property to use header.
> - Changed maintainer to Rob Herring.
> - Defined two seperate phandles for 'dmas' under examples.
> - Rename the YAML file name to the compatible 'ti,omap2420-mmc'.
> - Added missing type and maxItems to 'ti,hwmods' under properties.
> - Link to v1: https://lore.kernel.org/r/20250510-ti-omap-v1-1-588b0ccb1823@gmail.com
> ---
>  .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml   | 64 ++++++++++++++++++++++
>  Documentation/devicetree/bindings/mmc/ti-omap.txt  | 26 ---------
>  2 files changed, 64 insertions(+), 26 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
> new file mode 100644
> index 0000000000000000000000000000000000000000..195db77e0063b867f318ffc6b5f8811adb531515
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
> @@ -0,0 +1,64 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/ti,omap2420-mmc.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: TI MMC host controller for OMAP1 and 2420
> +
> +description:
> +  The MMC Host controller for TI OMAP1 and 2420 family provides
> +  an interface for MMC, SD and SDIO types of memory cards.
> +
> +allOf:
> +  - $ref: mmc-controller.yaml
> +
> +maintainers:
> +  - Rob Herring <robh@kernel.org>

This patch looks fine, but I don't want to ack this with Rob's name
there. Tony Lindgren <tony@atomide.com> wrote the original binding
as far as I saw from a quick check, maybe he's a more suitable pick?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Krzysztof Kozlowski]

On 19/05/2025 15:11, Charan Pedumuru wrote:
> +
> +  ti,hwmods:
> +    maxItems: 1
> +    items:
> +      type: string

That's not really correct. That's just a string, so no items, no
maxItems and use proper ref, not type string.

> +      pattern: "^msdi[0-9]+$"
> +
> +required:
> +  - compatible
> +  - reg
> +  - interrupts
> +  - dmas
> +  - dma-names
> +  - ti,hwmods
> +


Best regards,
Krzysztof

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Charan Pedumuru]

On 19-05-2025 21:29, Conor Dooley wrote:
> On Mon, May 19, 2025 at 01:11:17PM +0000, Charan Pedumuru wrote:
>> Convert TI MMC host controller binding to YAML format.
>> Changes during Conversion:
>> - Add new properties 'dma', 'dma-names' under required.
>> - Define two separate phandles for 'dmas' in the examples.
>> - Include appropriate header file for interrupts and use
>>   it in the examples.
>>
>> Signed-off-by: Charan Pedumuru <charan.pedumuru@gmail.com>
>> ---
>> Changes in v2:
>> - Added include statement for irq interrupt controller and
>>   modified the interrupts under property to use header.
>> - Changed maintainer to Rob Herring.
>> - Defined two seperate phandles for 'dmas' under examples.
>> - Rename the YAML file name to the compatible 'ti,omap2420-mmc'.
>> - Added missing type and maxItems to 'ti,hwmods' under properties.
>> - Link to v1: https://lore.kernel.org/r/20250510-ti-omap-v1-1-588b0ccb1823@gmail.com
>> ---
>>  .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml   | 64 ++++++++++++++++++++++
>>  Documentation/devicetree/bindings/mmc/ti-omap.txt  | 26 ---------
>>  2 files changed, 64 insertions(+), 26 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..195db77e0063b867f318ffc6b5f8811adb531515
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
>> @@ -0,0 +1,64 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/mmc/ti,omap2420-mmc.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: TI MMC host controller for OMAP1 and 2420
>> +
>> +description:
>> +  The MMC Host controller for TI OMAP1 and 2420 family provides
>> +  an interface for MMC, SD and SDIO types of memory cards.
>> +
>> +allOf:
>> +  - $ref: mmc-controller.yaml
>> +
>> +maintainers:
>> +  - Rob Herring <robh@kernel.org>
> 
> This patch looks fine, but I don't want to ack this with Rob's name
> there. Tony Lindgren <tony@atomide.com> wrote the original binding
> as far as I saw from a quick check, maybe he's a more suitable pick?

Sure, I will add Tony to the maintainers then.

-- 
Best Regards,
Charan.

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Charan Pedumuru]

On 19-05-2025 21:36, Krzysztof Kozlowski wrote:
> On 19/05/2025 15:11, Charan Pedumuru wrote:
>> +
>> +  ti,hwmods:
>> +    maxItems: 1
>> +    items:
>> +      type: string
> 
> That's not really correct. That's just a string, so no items, no
> maxItems and use proper ref, not type string.

Okay, I will define string definition using $ref

 
> 
>> +      pattern: "^msdi[0-9]+$"
>> +
>> +required:
>> +  - compatible
>> +  - reg
>> +  - interrupts
>> +  - dmas
>> +  - dma-names
>> +  - ti,hwmods
>> +
> 
> 
> Best regards,
> Krzysztof

-- 
Best Regards,
Charan.

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Rob Herring]

On Tue, May 20, 2025 at 10:06:50AM +0530, Charan Pedumuru wrote:
> 
> 
> On 19-05-2025 21:29, Conor Dooley wrote:
> > On Mon, May 19, 2025 at 01:11:17PM +0000, Charan Pedumuru wrote:
> >> Convert TI MMC host controller binding to YAML format.
> >> Changes during Conversion:
> >> - Add new properties 'dma', 'dma-names' under required.
> >> - Define two separate phandles for 'dmas' in the examples.
> >> - Include appropriate header file for interrupts and use
> >>   it in the examples.
> >>
> >> Signed-off-by: Charan Pedumuru <charan.pedumuru@gmail.com>
> >> ---
> >> Changes in v2:
> >> - Added include statement for irq interrupt controller and
> >>   modified the interrupts under property to use header.
> >> - Changed maintainer to Rob Herring.
> >> - Defined two seperate phandles for 'dmas' under examples.
> >> - Rename the YAML file name to the compatible 'ti,omap2420-mmc'.
> >> - Added missing type and maxItems to 'ti,hwmods' under properties.
> >> - Link to v1: https://lore.kernel.org/r/20250510-ti-omap-v1-1-588b0ccb1823@gmail.com
> >> ---
> >>  .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml   | 64 ++++++++++++++++++++++
> >>  Documentation/devicetree/bindings/mmc/ti-omap.txt  | 26 ---------
> >>  2 files changed, 64 insertions(+), 26 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
> >> new file mode 100644
> >> index 0000000000000000000000000000000000000000..195db77e0063b867f318ffc6b5f8811adb531515
> >> --- /dev/null
> >> +++ b/Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml
> >> @@ -0,0 +1,64 @@
> >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> >> +%YAML 1.2
> >> +---
> >> +$id: http://devicetree.org/schemas/mmc/ti,omap2420-mmc.yaml#
> >> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> >> +
> >> +title: TI MMC host controller for OMAP1 and 2420
> >> +
> >> +description:
> >> +  The MMC Host controller for TI OMAP1 and 2420 family provides
> >> +  an interface for MMC, SD and SDIO types of memory cards.
> >> +
> >> +allOf:
> >> +  - $ref: mmc-controller.yaml
> >> +
> >> +maintainers:
> >> +  - Rob Herring <robh@kernel.org>
> > 
> > This patch looks fine, but I don't want to ack this with Rob's name
> > there. Tony Lindgren <tony@atomide.com> wrote the original binding
> > as far as I saw from a quick check, maybe he's a more suitable pick?
> 
> Sure, I will add Tony to the maintainers then.

Replace, not add.

Rob

Re: [PATCH v2] dt-bindings: mmc: ti-omap: convert text based binding to json schema

[Rob Herring]

On Tue, May 20, 2025 at 10:41:31AM +0530, Charan Pedumuru wrote:
> 
> 
> On 19-05-2025 21:36, Krzysztof Kozlowski wrote:
> > On 19/05/2025 15:11, Charan Pedumuru wrote:
> >> +
> >> +  ti,hwmods:
> >> +    maxItems: 1
> >> +    items:
> >> +      type: string
> > 
> > That's not really correct. That's just a string, so no items, no
> > maxItems and use proper ref, not type string.
> 
> Okay, I will define string definition using $ref

You can actually just omit it and just have 'pattern'. Anything that's a 
pattern is implicitly a string.

Rob