linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robh+dt@kernel.org>
To: Lubomir Rintel <lkundrak@v3.sk>
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jason Cooper <jason@lakedaemon.net>,
	Marc Zyngier <maz@kernel.org>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Kishon Vijay Abraham I <kishon@ti.com>,
	Alessandro Zummo <a.zummo@towertech.it>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Mark Brown <broonie@kernel.org>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Andrew Lunn <andrew@lunn.ch>,
	Gregory Clement <gregory.clement@bootlin.com>,
	Daniel Mack <daniel@zonque.org>,
	Haojian Zhuang <haojian.zhuang@gmail.com>,
	Robert Jarzmik <robert.jarzmik@free.fr>,
	devicetree@vger.kerne
Subject: Re: [PATCH 19/28] dt-bindings: mmc: Convert sdhci-pxa to json-schema
Date: Wed, 18 Mar 2020 16:37:55 -0600	[thread overview]
Message-ID: <CAL_JsqK-z+yx6vMv_vUCc-QCigDnN8K3zPkbWM_CgXj02FGY2w@mail.gmail.com> (raw)
In-Reply-To: <20200317093922.20785-20-lkundrak@v3.sk>

On Tue, Mar 17, 2020 at 3:40 AM Lubomir Rintel <lkundrak@v3.sk> wrote:
>
> Convert the sdhci-pxa binding to DT schema format using json-schema.

Ignore what my bot said, I see you addressed that earlier in the series.

> At the same time, fix a couple of issues with the examples discovered by
> the validation tool -- a semicolon instead of a comma and wrong node names.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
>  .../devicetree/bindings/mmc/sdhci-pxa.txt     |  50 ---------
>  .../devicetree/bindings/mmc/sdhci-pxa.yaml    | 101 ++++++++++++++++++
>  2 files changed, 101 insertions(+), 50 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
>  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml
>
> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
> deleted file mode 100644
> index 3d1b449d6097d..0000000000000
> --- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -* Marvell sdhci-pxa v2/v3 controller
> -
> -This file documents differences between the core properties in mmc.txt
> -and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers.
> -
> -Required properties:
> -- compatible: Should be "mrvl,pxav2-mmc", "mrvl,pxav3-mmc" or
> -  "marvell,armada-380-sdhci".
> -- reg:
> -  * for "mrvl,pxav2-mmc" and "mrvl,pxav3-mmc", one register area for
> -    the SDHCI registers.
> -
> -  * for "marvell,armada-380-sdhci", three register areas. The first
> -    one for the SDHCI registers themselves, the second one for the
> -    AXI/Mbus bridge registers of the SDHCI unit, the third one for the
> -    SDIO3 Configuration register
> -- reg names: should be "sdhci", "mbus", "conf-sdio3". only mandatory
> -  for "marvell,armada-380-sdhci"
> -- clocks: Array of clocks required for SDHCI; requires at least one for
> -    I/O clock.
> -- clock-names: Array of names corresponding to clocks property; shall be
> -    "io" for I/O clock and "core" for optional core clock.
> -
> -Optional properties:
> -- mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning.
> -
> -Example:
> -
> -sdhci@d4280800 {
> -       compatible = "mrvl,pxav3-mmc";
> -       reg = <0xd4280800 0x800>;
> -       bus-width = <8>;
> -       interrupts = <27>;
> -       clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>;
> -       clock-names = "io", "core";
> -       non-removable;
> -       mrvl,clk-delay-cycles = <31>;
> -};
> -
> -sdhci@d8000 {
> -       compatible = "marvell,armada-380-sdhci";
> -       reg-names = "sdhci", "mbus", "conf-sdio3";
> -       reg = <0xd8000 0x1000>,
> -               <0xdc000 0x100>;
> -               <0x18454 0x4>;
> -       interrupts = <0 25 0x4>;
> -       clocks = <&gateclk 17>;
> -       clock-names = "io";
> -       mrvl,clk-delay-cycles = <0x1F>;
> -};
> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml b/Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml
> new file mode 100644
> index 0000000000000..4ae0926ac294f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml
> @@ -0,0 +1,101 @@
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/sdhci-pxa.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Marvell PXA SDHCI v2/v3 bindings
> +
> +maintainers:
> +  - devicetree@vger.kernel.org
> +
> +allOf:
> +  - $ref: mmc-controller.yaml#
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: marvell,armada-380-sdhci
> +    then:
> +      properties:
> +        regs:
> +          minItems: 3
> +          maxItems: 3

Here, you just need minItems.

> +        reg-names:
> +          items:
> +            - const: sdhci
> +            - const: mbus
> +            - const: conf-sdio3

This should be under the main definition of 'reg-names' and then just
'minItems: 3' here.

> +      required:
> +        - reg-names
> +    else:
> +      properties:
> +        regs:
> +          minItems: 1
> +          maxItems: 1

Just 'maxItems' is sufficient.

> +        reg-names:
> +          minItems: 1
> +          maxItems: 1
> +
> +properties:
> +  compatible:
> +    enum:
> +      - mrvl,pxav2-mmc
> +      - mrvl,pxav3-mmc
> +      - marvell,armada-380-sdhci
> +
> +  reg: true

Here you should have:

minItems: 1
maxItems: 3

> +
> +  reg-names: true
> +
> +  interrupts:
> +    maxItems: 1
> +
> +  clocks:
> +    minItems: 1
> +    maxItems: 2
> +
> +  clock-names:
> +    minItems: 1
> +    maxItems: 2
> +    items:
> +      - const: io
> +      - const: core
> +
> +  mrvl,clk-delay-cycles:
> +    description: Specify a number of cycles to delay for tuning.
> +    $ref: /schemas/types.yaml#/definitions/uint32

No range of valid values?

> +
> +required:
> +  - compatible
> +  - reg
> +  - interrupts
> +  - clocks
> +  - clock-names
> +
> +examples:
> +  - |
> +    #include <dt-bindings/clock/berlin2.h>
> +    mmc@d4280800 {
> +        compatible = "mrvl,pxav3-mmc";
> +        reg = <0xd4280800 0x800>;
> +        bus-width = <8>;
> +        interrupts = <27>;
> +        clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>;
> +        clock-names = "io", "core";
> +        non-removable;
> +        mrvl,clk-delay-cycles = <31>;
> +    };
> +  - |
> +    mmc@d8000 {
> +        compatible = "marvell,armada-380-sdhci";
> +        reg-names = "sdhci", "mbus", "conf-sdio3";
> +        reg = <0xd8000 0x1000>,
> +              <0xdc000 0x100>,
> +              <0x18454 0x4>;
> +        interrupts = <0 25 0x4>;
> +        clocks = <&gateclk 17>;
> +        clock-names = "io";
> +        mrvl,clk-delay-cycles = <0x1F>;
> +    };
> +
> +...
> --
> 2.25.1
>

  parent reply	other threads:[~2020-03-18 22:37 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-17  9:38 [PATCH 00/28] DT: Improve validation for Marvell SoCs Lubomir Rintel
2020-03-17  9:38 ` [PATCH 01/28] ARM: dts: kirkwood: Fix interrupt controller node name Lubomir Rintel
     [not found]   ` <20200317093922.20785-2-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-17 13:20     ` Andrew Lunn
2020-03-17  9:39 ` [PATCH 08/28] ARM: dts: mmp*: Fix up encoding of the /rtc interrupts property Lubomir Rintel
     [not found]   ` <20200317093922.20785-9-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-17 13:30     ` Andrew Lunn
2020-03-17 13:30     ` Andrew Lunn
2020-03-17  9:39 ` [PATCH 10/28] ARM: dts: mmp3: fix USB & USB PHY node names Lubomir Rintel
2020-03-17 13:32   ` Andrew Lunn
2020-03-17  9:39 ` [PATCH 11/28] ARM: dts: berlin*: Fix up the SDHCI " Lubomir Rintel
2020-03-17 13:34   ` Andrew Lunn
2020-03-17  9:39 ` [PATCH 12/28] spi: dt-bindings: spi-controller: Slaves have no address cells Lubomir Rintel
     [not found]   ` <20200317093922.20785-13-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-19 16:51     ` Rob Herring
2020-03-17  9:39 ` [PATCH 13/28] dt-bindings: serial: move Marvell compatible string to 8250 binding doc Lubomir Rintel
2020-03-17 13:48   ` Andrew Lunn
2020-03-17 19:09     ` Lubomir Rintel
2020-03-19 16:09     ` Rob Herring
     [not found]   ` <20200317093922.20785-14-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-19 16:11     ` Rob Herring
2020-03-20  9:24       ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 14/28] dt-bindings: arm: l2x0: Tauros 3 is PL310 compatible Lubomir Rintel
2020-03-27 19:03   ` Rob Herring
2020-03-27 19:04   ` Rob Herring
2020-03-17  9:39 ` [PATCH 15/28] dt-bindings: arm: mrvl: Add missing compatible strings Lubomir Rintel
2020-03-17 13:54   ` Andrew Lunn
2020-03-27 19:06   ` Rob Herring
2020-03-17  9:39 ` [PATCH 16/28] dt-bindings: Add "mrvl", a legacy vendor prefix for Marvell Lubomir Rintel
2020-03-27 19:06   ` Rob Herring
     [not found] ` <20200317093922.20785-1-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-17  9:38   ` [PATCH 02/28] ARM: dts: dove: Fix interrupt controller node name Lubomir Rintel
2020-03-17 13:20     ` Andrew Lunn
2020-03-17  9:38   ` [PATCH 03/28] ARM: dts: pxa168: Add missing address/size cells to i2c nodes Lubomir Rintel
     [not found]     ` <20200317093922.20785-4-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-17 13:21       ` Andrew Lunn
2020-03-17  9:38   ` [PATCH 04/28] ARM: dts: pxa168: Fix the gpio interrupt cell number Lubomir Rintel
2020-03-17 13:27     ` Andrew Lunn
2020-03-17  9:38   ` [PATCH 05/28] ARM: dts: pxa3xx: Fix up encoding of the /gpio interrupts property Lubomir Rintel
     [not found]     ` <20200317093922.20785-6-lkundrak-NGH9Lh4a5iE@public.gmane.org>
2020-03-17 13:28       ` Andrew Lunn
2020-03-21  7:36         ` Robert Jarzmik
2020-03-17  9:39   ` [PATCH 06/28] ARM: dts: pxa910: Fix the gpio interrupt cell number Lubomir Rintel
2020-03-17 13:29     ` Andrew Lunn
2020-03-17  9:39   ` [PATCH 07/28] ARM: dts: pxa*: Fix up encoding of the /rtc interrupts property Lubomir Rintel
2020-03-17 13:29     ` Andrew Lunn
2020-03-17  9:39   ` [PATCH 09/28] ARM: dts: mmp3: fix L2 cache controller node name Lubomir Rintel
2020-03-17 13:31     ` Andrew Lunn
2020-03-17  9:39   ` [PATCH 17/28] dt-bindings: mmc: Fix up clk-phase-sd-hs in an example Lubomir Rintel
2020-03-17 10:04     ` Sergei Shtylyov
2020-03-27 19:08     ` Rob Herring
2020-03-17  9:39   ` [PATCH 20/28] dt-bindings: phy: Convert phy-mmp3-usb to json-schema Lubomir Rintel
2020-03-27 19:09     ` Rob Herring
2020-03-17  9:39   ` [PATCH 22/28] dt-bindings: i2c: Convert i2c-pxa " Lubomir Rintel
2020-06-03 20:41     ` Wolfram Sang
2020-03-17 13:19   ` [PATCH 00/28] DT: Improve validation for Marvell SoCs Mark Brown
2020-03-17  9:39 ` [PATCH 18/28] dt-bindings: mmc: Fix node name in an example Lubomir Rintel
2020-03-26 14:28   ` Ulf Hansson
2020-03-17  9:39 ` [PATCH 19/28] dt-bindings: mmc: Convert sdhci-pxa to json-schema Lubomir Rintel
2020-03-18 22:14   ` Rob Herring
2020-03-18 22:37   ` Rob Herring [this message]
2020-05-17 18:35     ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 21/28] dt-bindings: gpio: Convert mrvl-gpio " Lubomir Rintel
2020-03-27 10:04   ` Linus Walleij
2020-03-27 19:29     ` Rob Herring
2020-03-27 19:28   ` Rob Herring
2020-05-17 19:00     ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 23/28] dt-bindings: interrupt-controller: Convert mrvl,intc " Lubomir Rintel
2020-03-27 19:42   ` Rob Herring
2020-05-17 19:11     ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 24/28] dt-bindings: media: Convert marvell,mmp2-ccic " Lubomir Rintel
2020-03-27 19:46   ` Rob Herring
2020-05-17 19:21     ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 25/28] dt-bindings: rtc: Convert sa1100-rtc " Lubomir Rintel
2020-03-27 19:49   ` Rob Herring
2020-05-17 19:25     ` Lubomir Rintel
2020-05-18 15:12       ` Rob Herring
2020-03-17  9:39 ` [PATCH 26/28] dt-bindings: spi: Convert spi-pxa2xx " Lubomir Rintel
2020-03-27 19:52   ` Rob Herring
2020-05-17 19:30     ` Lubomir Rintel
2020-03-17  9:39 ` [PATCH 27/28] dt-bindings: timer: Convert mrvl,mmp-timer " Lubomir Rintel
2020-03-27 19:53   ` Rob Herring
2020-03-17  9:39 ` [PATCH 28/28] dt-bindings: usb: Convert ehci-mv " Lubomir Rintel
2020-03-27 19:55   ` Rob Herring
2020-05-17 19:34     ` Lubomir Rintel
2020-05-18 15:20       ` Rob Herring
2020-03-17 13:46 ` [PATCH 00/28] DT: Improve validation for Marvell SoCs Andrew Lunn
     [not found]   ` <20200317134609.GN24270-g2DYL2Zd6BY@public.gmane.org>
2020-03-17 13:55     ` Alexandre Belloni
     [not found]       ` <20200317135551.GE3448-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org>
2020-03-17 13:59         ` Andrew Lunn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAL_JsqK-z+yx6vMv_vUCc-QCigDnN8K3zPkbWM_CgXj02FGY2w@mail.gmail.com \
    --to=robh+dt@kernel.org \
    --cc=a.zummo@towertech.it \
    --cc=alexandre.belloni@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=bgolaszewski@baylibre.com \
    --cc=broonie@kernel.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=daniel@zonque.org \
    --cc=devicetree@vger.kerne \
    --cc=gregkh@linuxfoundation.org \
    --cc=gregory.clement@bootlin.com \
    --cc=haojian.zhuang@gmail.com \
    --cc=jason@lakedaemon.net \
    --cc=kishon@ti.com \
    --cc=linus.walleij@linaro.org \
    --cc=lkundrak@v3.sk \
    --cc=maz@kernel.org \
    --cc=mchehab@kernel.org \
    --cc=robert.jarzmik@free.fr \
    --cc=tglx@linutronix.de \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).