Re: [PATCH v2 1/4] dt-bindings: mmc: convert mmc-spi-slot to yaml

Rob Herring
2022-06-06T19:30:45Z

On Mon, Jun 06, 2022 at 04:25:55PM +0100, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> Convert the mmc-spi-slot text based binding doc to yaml,
> with the side effect of cleaning up some of the riscv
> dtbs_check warnings.
>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> .../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 -------
> .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 79 +++++++++++++++++++
> 2 files changed, 79 insertions(+), 29 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> deleted file mode 100644
> index 5e74db69f581..000000000000
> --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -MMC/SD/SDIO slot directly connected to a SPI bus
> -
> -This file documents differences between the core properties described
> -by mmc.txt and the properties used by the mmc_spi driver.
> -
> -Required properties:
> -- spi-max-frequency : maximum frequency for this device (Hz).
> -
> -Optional properties:
> -- 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. If not provided, 3.2v..3.4v is assumed.
> -- gpios : may specify GPIOs in this order: Card-Detect GPIO,
> - Write-Protect GPIO. Note that this does not follow the
> - binding from mmc.txt, for historical reasons.
> -
> -Example:
> -
> - mmc-slot@0 {
> - compatible = "fsl,mpc8323rdb-mmc-slot",
> - "mmc-spi-slot";
> - reg = <0>;
> - gpios = <&qe_pio_d 14 1
> - &qe_pio_d 15 0>;
> - voltage-ranges = <3300 3300>;
> - spi-max-frequency = <50000000>;
> - interrupts = <42>;
> - interrupt-parent = <&PIC>;
> - };
> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> new file mode 100644
> index 000000000000..cf79092de8fe
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> @@ -0,0 +1,79 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/mmc-spi-slot.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: MMC/SD/SDIO slot directly connected to a SPI bus
> +
> +maintainers:
> + - Ulf Hansson <ulf.hansson@linaro.org>
> +
> +allOf:
> + - $ref: "mmc-controller.yaml"
> + - $ref: /schemas/spi/spi-peripheral-props.yaml
> +
> +description: |
> + The extra properties used by an mmc connected via SPI.
> +
> +properties:
> + compatible:
> + const: mmc-spi-slot
> +
> + reg:
> + maxItems: 1
> +
> + spi-max-frequency: true
> +
> + interrupts:
> + maxItems: 1
> +
> + voltage-ranges:
> + $ref: /schemas/types.yaml#/definitions/uint32-matrix

Looks more like an array to me.

Otherwise,

Reviewed-by: Rob Herring <robh@kernel.org>

> + description: |
> + Two cells are required, first cell specifies minimum slot voltage (mV),
> + second cell specifies maximum slot voltage (mV).
> + items:
> + items:
> + - description: |
> + value for minimum slot voltage
> + default: 3200
> + - description: |
> + value for maximum slot voltage
> + default: 3400
> + maxItems: 1
> +
> + gpios:
> + description: |
> + For historical reasons, this does not follow the generic mmc-controller
> + binding.
> + minItems: 1
> + items:
> + - description: Card-Detect GPIO
> + - description: Write-Protect GPIO
> +
> +required:
> + - compatible
> + - reg
> + - spi-max-frequency
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/gpio/gpio.h>
> + spi {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + mmc@0 {
> + compatible = "mmc-spi-slot";
> + reg = <0>;
> + gpios = <&gpio 14 GPIO_ACTIVE_LOW>, <&gpio 15 GPIO_ACTIVE_HIGH>;
> + voltage-ranges = <3300 3300>;
> + spi-max-frequency = <50000000>;
> + interrupts = <42>;
> + interrupt-parent = <&PIC>;
> + };
> + };
> +
> +...
> --
> 2.36.1
>
>