Re: [PATCH 1/3] dt-bindings: mmc: iproc-sdhci: Convert to json-schema

Ulf Hansson
2021-04-12T07:52:48Z

On Tue, 6 Apr 2021 at 12:48, Nicolas Saenz Julienne <nsaenz@kernel.org> wrote:
>
> Convert the brcm,iproc-sdhci binding to DT schema format using json-schema
>
> Signed-off-by: Nicolas Saenz Julienne <nsaenz@kernel.org>

Applied for next, thanks! (I guess patch2 and patch3 needs a re-spin?)

Kind regards
Uffe

>
> ---
>
> .../bindings/mmc/brcm,iproc-sdhci.yaml | 63 +++++++++++++++++++
> .../bindings/mmc/brcm,sdhci-iproc.txt | 37 -----------
> 2 files changed, 63 insertions(+), 37 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
> delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
>
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml b/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
> new file mode 100644
> index 000000000000..6f569fbfa134
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
> @@ -0,0 +1,63 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/brcm,iproc-sdhci.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Broadcom IPROC SDHCI controller
> +
> +maintainers:
> + - Ray Jui <ray.jui@broadcom.com>
> + - Scott Branden <scott.branden@broadcom.com>
> + - Nicolas Saenz Julienne <nsaenz@kernel.org>
> +
> +allOf:
> + - $ref: mmc-controller.yaml#
> +
> +properties:
> + compatible:
> + enum:
> + - brcm,bcm2835-sdhci
> + - brcm,bcm2711-emmc2
> + - brcm,sdhci-iproc-cygnus
> + - brcm,sdhci-iproc
> +
> + reg:
> + minItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
> + description:
> + Handle to core clock for the sdhci controller.
> +
> + sdhci,auto-cmd12:
> + type: boolean
> + description: Specifies that controller should use auto CMD12
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - clocks
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/irq.h>
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/clock/bcm-cygnus.h>
> +
> + mmc@18041000 {
> + compatible = "brcm,sdhci-iproc-cygnus";
> + reg = <0x18041000 0x100>;
> + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
> + bus-width = <4>;
> + sdhci,auto-cmd12;
> + no-1-8-v;
> + };
> +...
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
> deleted file mode 100644
> index 09d87cc1182a..000000000000
> --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -Broadcom IPROC SDHCI controller
> -
> -This file documents differences between the core properties described
> -by mmc.txt and the properties that represent the IPROC SDHCI controller.
> -
> -Required properties:
> -- compatible : Should be one of the following
> - "brcm,bcm2835-sdhci"
> - "brcm,bcm2711-emmc2"
> - "brcm,sdhci-iproc-cygnus"
> - "brcm,sdhci-iproc"
> -
> -Use brcm2835-sdhci for the eMMC controller on the BCM2835 (Raspberry Pi) and
> -bcm2711-emmc2 for the additional eMMC2 controller on BCM2711.
> -
> -Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers
> -restricted to 32bit host accesses to SDHCI registers.
> -
> -Use sdhci-iproc for Broadcom SDHCI Controllers that allow standard
> -8, 16, 32-bit host access to SDHCI register.
> -
> -- clocks : The clock feeding the SDHCI controller.
> -
> -Optional properties:
> - - sdhci,auto-cmd12: specifies that controller should use auto CMD12.
> -
> -Example:
> -
> -sdhci0: sdhci@18041000 {
> - compatible = "brcm,sdhci-iproc-cygnus";
> - reg = <0x18041000 0x100>;
> - interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
> - bus-width = <4>;
> - sdhci,auto-cmd12;
> - no-1-8-v;
> -};
> --
> 2.30.2
>