diff mbox series

[2/2] dt-bindings: mmc: brcm,kona-sdhci: convert to YAML

Message ID a1fd4092b8a31c2ee58a3cd4cca062db13197b45.1683548624.git.stano.jakubek@gmail.com
State New
Headers
Series [1/2] ARM: dts: bcm-mobile: align SDHCI node name with bindings |

Commit Message

Stanislav Jakubek May 8, 2023, 12:46 p.m. UTC 
  Convert Broadcom Kona family SDHCI controller bindings to DT schema.

Changes during conversion:
  - also mark reg and interrupts as required
  - drop deprecated compatible (it's been deprecated for ~10 years)

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
---
 .../bindings/mmc/brcm,kona-sdhci.txt          | 21 --------
 .../bindings/mmc/brcm,kona-sdhci.yaml         | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 21 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml

Comments

Conor Dooley May 8, 2023, 7:56 p.m. UTC | #1 
On Mon, May 08, 2023 at 02:46:03PM +0200, Stanislav Jakubek wrote:
> Convert Broadcom Kona family SDHCI controller bindings to DT schema.
> 
> Changes during conversion:
>   - also mark reg and interrupts as required
>   - drop deprecated compatible (it's been deprecated for ~10 years)
> 
> Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

> ---
>  .../bindings/mmc/brcm,kona-sdhci.txt          | 21 --------
>  .../bindings/mmc/brcm,kona-sdhci.yaml         | 48 +++++++++++++++++++
>  2 files changed, 48 insertions(+), 21 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
>  create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
> 
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
> deleted file mode 100644
> index 7f5dd83f5bd9..000000000000
> --- a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Broadcom BCM281xx SDHCI
> -
> -This file documents differences between the core properties in mmc.txt
> -and the properties present in the bcm281xx SDHCI
> -
> -Required properties:
> -- compatible : Should be "brcm,kona-sdhci"
> -- DEPRECATED: compatible : Should be "bcm,kona-sdhci"
> -- clocks: phandle + clock specifier pair of the external clock
> -
> -Refer to clocks/clock-bindings.txt for generic clock consumer properties.
> -
> -Example:
> -
> -sdio2: sdio@3f1a0000 {
> -	compatible = "brcm,kona-sdhci";
> -	reg = <0x3f1a0000 0x10000>;
> -	clocks = <&sdio3_clk>;
> -	interrupts = <0x0 74 0x4>;
> -};
> -
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
> new file mode 100644
> index 000000000000..87711edf9b39
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
> @@ -0,0 +1,48 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/brcm,kona-sdhci.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Broadcom Kona family SDHCI controller
> +
> +maintainers:
> +  - Florian Fainelli <f.fainelli@gmail.com>
> +
> +allOf:
> +  - $ref: sdhci-common.yaml#
> +
> +properties:
> +  compatible:
> +    const: brcm,kona-sdhci
> +
> +  reg:
> +    maxItems: 1
> +
> +  clocks:
> +    maxItems: 1
> +
> +  interrupts:
> +    maxItems: 1
> +
> +required:
> +  - compatible
> +  - reg
> +  - clocks
> +  - interrupts
> +
> +unevaluatedProperties: false
> +
> +examples:
> +  - |
> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> +    #include <dt-bindings/interrupt-controller/irq.h>
> +    #include "dt-bindings/clock/bcm281xx.h"
> +
> +    mmc@3f1a0000 {
> +        compatible = "brcm,kona-sdhci";
> +        reg = <0x3f1a0000 0x10000>;
> +        clocks = <&master_ccu BCM281XX_MASTER_CCU_SDIO3>;
> +        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
> +    };
> +...
> -- 
> 2.25.1
>
Krzysztof Kozlowski May 8, 2023, 8:27 p.m. UTC | #2 
On 08/05/2023 14:46, Stanislav Jakubek wrote:
> Convert Broadcom Kona family SDHCI controller bindings to DT schema.
> 
> Changes during conversion:
>   - also mark reg and interrupts as required
>   - drop deprecated compatible (it's been deprecated for ~10 years)


> +
> +examples:
> +  - |
> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> +    #include <dt-bindings/interrupt-controller/irq.h>
> +    #include "dt-bindings/clock/bcm281xx.h"

Why different than <>? Keep <>.

With above:

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

Best regards,
Krzysztof
Ulf Hansson May 9, 2023, 10:10 a.m. UTC | #3 
On Mon, 8 May 2023 at 22:27, Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 08/05/2023 14:46, Stanislav Jakubek wrote:
> > Convert Broadcom Kona family SDHCI controller bindings to DT schema.
> >
> > Changes during conversion:
> >   - also mark reg and interrupts as required
> >   - drop deprecated compatible (it's been deprecated for ~10 years)
>
>
> > +
> > +examples:
> > +  - |
> > +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> > +    #include <dt-bindings/interrupt-controller/irq.h>
> > +    #include "dt-bindings/clock/bcm281xx.h"
>
> Why different than <>? Keep <>.

I have fixed this up when applying, no need to re-spin.

>
> With above:
>
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>
> Best regards,
> Krzysztof
>

So, applied for next, thanks

Kind regards
Uffe
Florian Fainelli May 9, 2023, 9:19 p.m. UTC | #4 
On Mon, 8 May 2023 14:46:03 +0200, Stanislav Jakubek <stano.jakubek@gmail.com> wrote:
> Convert Broadcom Kona family SDHCI controller bindings to DT schema.
> 
> Changes during conversion:
>   - also mark reg and interrupts as required
>   - drop deprecated compatible (it's been deprecated for ~10 years)
> 
> Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
Florian Fainelli May 9, 2023, 9:20 p.m. UTC | #5 
On 5/9/23 14:19, Florian Fainelli wrote:
> On Mon, 8 May 2023 14:46:03 +0200, Stanislav Jakubek <stano.jakubek@gmail.com> wrote:
>> Convert Broadcom Kona family SDHCI controller bindings to DT schema.
>>
>> Changes during conversion:
>>    - also mark reg and interrupts as required
>>    - drop deprecated compatible (it's been deprecated for ~10 years)
>>
>> Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
>> ---
> 
> Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!

Sorry, that's not the one I intended to apply, dropped.
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
deleted file mode 100644
index 7f5dd83f5bd9..000000000000
--- a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
+++ /dev/null
@@ -1,21 +0,0 @@ 
-Broadcom BCM281xx SDHCI
-
-This file documents differences between the core properties in mmc.txt
-and the properties present in the bcm281xx SDHCI
-
-Required properties:
-- compatible : Should be "brcm,kona-sdhci"
-- DEPRECATED: compatible : Should be "bcm,kona-sdhci"
-- clocks: phandle + clock specifier pair of the external clock
-
-Refer to clocks/clock-bindings.txt for generic clock consumer properties.
-
-Example:
-
-sdio2: sdio@3f1a0000 {
-	compatible = "brcm,kona-sdhci";
-	reg = <0x3f1a0000 0x10000>;
-	clocks = <&sdio3_clk>;
-	interrupts = <0x0 74 0x4>;
-};
-
diff --git a/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
new file mode 100644
index 000000000000..87711edf9b39
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
@@ -0,0 +1,48 @@ 
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/brcm,kona-sdhci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom Kona family SDHCI controller
+
+maintainers:
+  - Florian Fainelli <f.fainelli@gmail.com>
+
+allOf:
+  - $ref: sdhci-common.yaml#
+
+properties:
+  compatible:
+    const: brcm,kona-sdhci
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - interrupts
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include "dt-bindings/clock/bcm281xx.h"
+
+    mmc@3f1a0000 {
+        compatible = "brcm,kona-sdhci";
+        reg = <0x3f1a0000 0x10000>;
+        clocks = <&master_ccu BCM281XX_MASTER_CCU_SDIO3>;
+        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+    };
+...