* [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema
@ 2022-04-14 23:05 Chris Packham
2022-04-14 23:06 ` [PATCH 1/4] ARM: dts: mvebu: Update mvsdio node names to match schema Chris Packham
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Chris Packham @ 2022-04-14 23:05 UTC (permalink / raw)
To: ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement,
sebastian.hesselbarth
Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel,
Chris Packham
This is a small series converting the device tree bindings for the orion and
dove sdhci controllers to JSON schema.
The first 2 patches update the dtsi files to use a node name enforces by the
schema. The next 2 patches convert the old text binding to JSON schema.
Chris Packham (4):
ARM: dts: mvebu: Update mvsdio node names to match schema
ARM: dts: dove: Update sdio-host node names to match schema
dt-bindings: mmc: convert orion-sdio to JSON schema
dt-bindings: mmc: convert sdhci-dove to JSON schema
.../bindings/mmc/marvell,dove-sdhci.yaml | 38 ++++++++++++++++
.../bindings/mmc/marvell,orion-sdio.yaml | 43 +++++++++++++++++++
.../devicetree/bindings/mmc/orion-sdio.txt | 16 -------
.../devicetree/bindings/mmc/sdhci-dove.txt | 14 ------
arch/arm/boot/dts/armada-370-xp.dtsi | 2 +-
arch/arm/boot/dts/armada-375.dtsi | 2 +-
arch/arm/boot/dts/dove.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-6192.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +-
10 files changed, 88 insertions(+), 37 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml
create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml
delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
--
2.35.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/4] ARM: dts: mvebu: Update mvsdio node names to match schema 2022-04-14 23:05 [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema Chris Packham @ 2022-04-14 23:06 ` Chris Packham 2022-04-14 23:06 ` [PATCH 2/4] ARM: dts: dove: Update sdio-host " Chris Packham ` (2 subsequent siblings) 3 siblings, 0 replies; 11+ messages in thread From: Chris Packham @ 2022-04-14 23:06 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Update the node names of the mvsdio@ interfaces to be mmc@ to match the node name enforced by the mmc-controller.yaml schema. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- arch/arm/boot/dts/armada-370-xp.dtsi | 2 +- arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/kirkwood-6192.dtsi | 2 +- arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +- arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 0b8c2a64b36f..c611166b6dc5 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -252,7 +252,7 @@ nand_controller: nand-controller@d0000 { status = "disabled"; }; - sdio: mvsdio@d4000 { + sdio: mmc@d4000 { compatible = "marvell,orion-sdio"; reg = <0xd4000 0x200>; interrupts = <54>; diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 7f2f24a29e6c..802cabb8dd8a 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -510,7 +510,7 @@ nand_controller: nand-controller@d0000 { status = "disabled"; }; - sdio: mvsdio@d4000 { + sdio: mmc@d4000 { compatible = "marvell,orion-sdio"; reg = <0xd4000 0x200>; interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi index 396bcba08adb..d558980af67b 100644 --- a/arch/arm/boot/dts/kirkwood-6192.dtsi +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi @@ -73,7 +73,7 @@ sata: sata@80000 { status = "disabled"; }; - sdio: mvsdio@90000 { + sdio: mmc@90000 { compatible = "marvell,orion-sdio"; reg = <0x90000 0x200>; interrupts = <28>; diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi index faa05849a40d..e09dbbf35078 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -73,7 +73,7 @@ sata: sata@80000 { status = "disabled"; }; - sdio: mvsdio@90000 { + sdio: mmc@90000 { compatible = "marvell,orion-sdio"; reg = <0x90000 0x200>; interrupts = <28>; diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index e84c54b77dea..bc372f48a1af 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -124,7 +124,7 @@ sata: sata@80000 { status = "disabled"; }; - sdio: mvsdio@90000 { + sdio: mmc@90000 { compatible = "marvell,orion-sdio"; reg = <0x90000 0x200>; interrupts = <28>; -- 2.35.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] ARM: dts: dove: Update sdio-host node names to match schema 2022-04-14 23:05 [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema Chris Packham 2022-04-14 23:06 ` [PATCH 1/4] ARM: dts: mvebu: Update mvsdio node names to match schema Chris Packham @ 2022-04-14 23:06 ` Chris Packham 2022-04-14 23:06 ` [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema Chris Packham 2022-04-14 23:06 ` [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove " Chris Packham 3 siblings, 0 replies; 11+ messages in thread From: Chris Packham @ 2022-04-14 23:06 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Update the node names of the sdio-host@ interfaces to be mmc@ to match the node name enforced by the mmc-controller.yaml schema. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- arch/arm/boot/dts/dove.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 89e0bdaf3a85..d81562eac7aa 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -337,7 +337,7 @@ channel1 { }; }; - sdio1: sdio-host@90000 { + sdio1: mmc@90000 { compatible = "marvell,dove-sdhci"; reg = <0x90000 0x100>; interrupts = <36>, <38>; @@ -380,7 +380,7 @@ ethphy: ethernet-phy { }; }; - sdio0: sdio-host@92000 { + sdio0: mmc@92000 { compatible = "marvell,dove-sdhci"; reg = <0x92000 0x100>; interrupts = <35>, <37>; -- 2.35.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema 2022-04-14 23:05 [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema Chris Packham 2022-04-14 23:06 ` [PATCH 1/4] ARM: dts: mvebu: Update mvsdio node names to match schema Chris Packham 2022-04-14 23:06 ` [PATCH 2/4] ARM: dts: dove: Update sdio-host " Chris Packham @ 2022-04-14 23:06 ` Chris Packham 2022-04-15 14:32 ` Rob Herring 2022-04-18 11:41 ` Krzysztof Kozlowski 2022-04-14 23:06 ` [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove " Chris Packham 3 siblings, 2 replies; 11+ messages in thread From: Chris Packham @ 2022-04-14 23:06 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Convert the orion-sdio binding to JSON schema. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- .../bindings/mmc/marvell,orion-sdio.yaml | 43 +++++++++++++++++++ .../devicetree/bindings/mmc/orion-sdio.txt | 16 ------- 2 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt diff --git a/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml b/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml new file mode 100644 index 000000000000..4fef53fc78ed --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/marvell,orion-sdio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell orion-sdio controller + +maintainers: + - Ulf Hansson <ulf.hansson@linaro.org> + +allOf: + - $ref: mmc-controller.yaml# + +properties: + compatible: + const: marvell,orion-sdio + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - clocks + +unevaluatedProperties: false + +examples: + - | + mmc@d00d4000 { + compatible = "marvell,orion-sdio"; + reg = <0xd00d4000 0x200>; + interrupts = <54>; + clocks = <&gateclk 17>; + }; diff --git a/Documentation/devicetree/bindings/mmc/orion-sdio.txt b/Documentation/devicetree/bindings/mmc/orion-sdio.txt deleted file mode 100644 index 10f0818a34c5..000000000000 --- a/Documentation/devicetree/bindings/mmc/orion-sdio.txt +++ /dev/null @@ -1,16 +0,0 @@ -* Marvell orion-sdio controller - -This file documents differences between the core properties in mmc.txt -and the properties used by the orion-sdio driver. - -- compatible: Should be "marvell,orion-sdio" -- clocks: reference to the clock of the SDIO interface - -Example: - - mvsdio@d00d4000 { - compatible = "marvell,orion-sdio"; - reg = <0xd00d4000 0x200>; - interrupts = <54>; - clocks = <&gateclk 17>; - }; -- 2.35.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema 2022-04-14 23:06 ` [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema Chris Packham @ 2022-04-15 14:32 ` Rob Herring 2022-04-20 21:16 ` Rob Herring 2022-04-18 11:41 ` Krzysztof Kozlowski 1 sibling, 1 reply; 11+ messages in thread From: Rob Herring @ 2022-04-15 14:32 UTC (permalink / raw) To: Chris Packham Cc: robh+dt, sebastian.hesselbarth, ulf.hansson, linux-kernel, linux-arm-kernel, devicetree, andrew, linux-mmc, gregory.clement, krzk+dt On Fri, 15 Apr 2022 11:06:02 +1200, Chris Packham wrote: > Convert the orion-sdio binding to JSON schema. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > .../bindings/mmc/marvell,orion-sdio.yaml | 43 +++++++++++++++++++ > .../devicetree/bindings/mmc/orion-sdio.txt | 16 ------- > 2 files changed, 43 insertions(+), 16 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml > delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt > Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings. Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future. Full log is available here: https://patchwork.ozlabs.org/patch/ mvsdio@90000: $nodename:0: 'mvsdio@90000' does not match '^mmc(@.*)?$' arch/arm/boot/dts/kirkwood-b3.dtb arch/arm/boot/dts/kirkwood-blackarmor-nas220.dtb arch/arm/boot/dts/kirkwood-c200-v1.dtb arch/arm/boot/dts/kirkwood-cloudbox.dtb arch/arm/boot/dts/kirkwood-d2net.dtb arch/arm/boot/dts/kirkwood-db-88f6281.dtb arch/arm/boot/dts/kirkwood-db-88f6282.dtb arch/arm/boot/dts/kirkwood-dir665.dtb arch/arm/boot/dts/kirkwood-dns320.dtb arch/arm/boot/dts/kirkwood-dns325.dtb arch/arm/boot/dts/kirkwood-dockstar.dtb arch/arm/boot/dts/kirkwood-dreamplug.dtb arch/arm/boot/dts/kirkwood-ds109.dtb arch/arm/boot/dts/kirkwood-ds110jv10.dtb arch/arm/boot/dts/kirkwood-ds111.dtb arch/arm/boot/dts/kirkwood-ds112.dtb arch/arm/boot/dts/kirkwood-ds209.dtb arch/arm/boot/dts/kirkwood-ds210.dtb arch/arm/boot/dts/kirkwood-ds212.dtb arch/arm/boot/dts/kirkwood-ds212j.dtb arch/arm/boot/dts/kirkwood-ds409.dtb arch/arm/boot/dts/kirkwood-ds409slim.dtb arch/arm/boot/dts/kirkwood-ds411.dtb arch/arm/boot/dts/kirkwood-ds411j.dtb arch/arm/boot/dts/kirkwood-ds411slim.dtb arch/arm/boot/dts/kirkwood-goflexnet.dtb arch/arm/boot/dts/kirkwood-guruplug-server-plus.dtb arch/arm/boot/dts/kirkwood-ib62x0.dtb arch/arm/boot/dts/kirkwood-iconnect.dtb arch/arm/boot/dts/kirkwood-iomega_ix2_200.dtb arch/arm/boot/dts/kirkwood-is2.dtb arch/arm/boot/dts/kirkwood-l-50.dtb arch/arm/boot/dts/kirkwood-laplug.dtb arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lsvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswxl.dtb arch/arm/boot/dts/kirkwood-linksys-viper.dtb arch/arm/boot/dts/kirkwood-lschlv2.dtb arch/arm/boot/dts/kirkwood-lsxhl.dtb arch/arm/boot/dts/kirkwood-mplcec4.dtb arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dtb arch/arm/boot/dts/kirkwood-nas2big.dtb arch/arm/boot/dts/kirkwood-net2big.dtb arch/arm/boot/dts/kirkwood-net5big.dtb arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dtb arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dtb arch/arm/boot/dts/kirkwood-ns2.dtb arch/arm/boot/dts/kirkwood-ns2lite.dtb arch/arm/boot/dts/kirkwood-ns2max.dtb arch/arm/boot/dts/kirkwood-ns2mini.dtb arch/arm/boot/dts/kirkwood-nsa310a.dtb arch/arm/boot/dts/kirkwood-nsa310.dtb arch/arm/boot/dts/kirkwood-nsa320.dtb arch/arm/boot/dts/kirkwood-nsa325.dtb arch/arm/boot/dts/kirkwood-openblocks_a6.dtb arch/arm/boot/dts/kirkwood-openblocks_a7.dtb arch/arm/boot/dts/kirkwood-openrd-base.dtb arch/arm/boot/dts/kirkwood-openrd-client.dtb arch/arm/boot/dts/kirkwood-openrd-ultimate.dtb arch/arm/boot/dts/kirkwood-pogo_e02.dtb arch/arm/boot/dts/kirkwood-pogoplug-series-4.dtb arch/arm/boot/dts/kirkwood-rd88f6192.dtb arch/arm/boot/dts/kirkwood-rd88f6281-a.dtb arch/arm/boot/dts/kirkwood-rd88f6281-z0.dtb arch/arm/boot/dts/kirkwood-rs212.dtb arch/arm/boot/dts/kirkwood-rs409.dtb arch/arm/boot/dts/kirkwood-rs411.dtb arch/arm/boot/dts/kirkwood-sheevaplug.dtb arch/arm/boot/dts/kirkwood-sheevaplug-esata.dtb arch/arm/boot/dts/kirkwood-t5325.dtb arch/arm/boot/dts/kirkwood-topkick.dtb arch/arm/boot/dts/kirkwood-ts219-6281.dtb arch/arm/boot/dts/kirkwood-ts219-6282.dtb arch/arm/boot/dts/kirkwood-ts419-6281.dtb arch/arm/boot/dts/kirkwood-ts419-6282.dtb mvsdio@90000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'broken-cd' were unexpected) arch/arm/boot/dts/kirkwood-dreamplug.dtb arch/arm/boot/dts/kirkwood-sheevaplug.dtb arch/arm/boot/dts/kirkwood-topkick.dtb mvsdio@90000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'cd-gpios' were unexpected) arch/arm/boot/dts/kirkwood-l-50.dtb arch/arm/boot/dts/kirkwood-mplcec4.dtb arch/arm/boot/dts/kirkwood-openrd-base.dtb arch/arm/boot/dts/kirkwood-openrd-client.dtb arch/arm/boot/dts/kirkwood-openrd-ultimate.dtb arch/arm/boot/dts/kirkwood-rd88f6281-a.dtb arch/arm/boot/dts/kirkwood-rd88f6281-z0.dtb mvsdio@90000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'cd-gpios', 'wp-gpios' were unexpected) arch/arm/boot/dts/kirkwood-pogoplug-series-4.dtb arch/arm/boot/dts/kirkwood-sheevaplug-esata.dtb mvsdio@90000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'non-removable' were unexpected) arch/arm/boot/dts/kirkwood-guruplug-server-plus.dtb mvsdio@90000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed' were unexpected) arch/arm/boot/dts/kirkwood-b3.dtb arch/arm/boot/dts/kirkwood-blackarmor-nas220.dtb arch/arm/boot/dts/kirkwood-c200-v1.dtb arch/arm/boot/dts/kirkwood-cloudbox.dtb arch/arm/boot/dts/kirkwood-d2net.dtb arch/arm/boot/dts/kirkwood-dir665.dtb arch/arm/boot/dts/kirkwood-dns320.dtb arch/arm/boot/dts/kirkwood-dns325.dtb arch/arm/boot/dts/kirkwood-dockstar.dtb arch/arm/boot/dts/kirkwood-ds109.dtb arch/arm/boot/dts/kirkwood-ds110jv10.dtb arch/arm/boot/dts/kirkwood-ds111.dtb arch/arm/boot/dts/kirkwood-ds112.dtb arch/arm/boot/dts/kirkwood-ds209.dtb arch/arm/boot/dts/kirkwood-ds210.dtb arch/arm/boot/dts/kirkwood-ds212.dtb arch/arm/boot/dts/kirkwood-ds212j.dtb arch/arm/boot/dts/kirkwood-ds409.dtb arch/arm/boot/dts/kirkwood-ds409slim.dtb arch/arm/boot/dts/kirkwood-ds411.dtb arch/arm/boot/dts/kirkwood-ds411j.dtb arch/arm/boot/dts/kirkwood-ds411slim.dtb arch/arm/boot/dts/kirkwood-goflexnet.dtb arch/arm/boot/dts/kirkwood-ib62x0.dtb arch/arm/boot/dts/kirkwood-iconnect.dtb arch/arm/boot/dts/kirkwood-iomega_ix2_200.dtb arch/arm/boot/dts/kirkwood-is2.dtb arch/arm/boot/dts/kirkwood-laplug.dtb arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lsvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswvl.dtb arch/arm/boot/dts/kirkwood-linkstation-lswxl.dtb arch/arm/boot/dts/kirkwood-linksys-viper.dtb arch/arm/boot/dts/kirkwood-lschlv2.dtb arch/arm/boot/dts/kirkwood-lsxhl.dtb arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dtb arch/arm/boot/dts/kirkwood-nas2big.dtb arch/arm/boot/dts/kirkwood-net2big.dtb arch/arm/boot/dts/kirkwood-net5big.dtb arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dtb arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dtb arch/arm/boot/dts/kirkwood-ns2.dtb arch/arm/boot/dts/kirkwood-ns2lite.dtb arch/arm/boot/dts/kirkwood-ns2max.dtb arch/arm/boot/dts/kirkwood-ns2mini.dtb arch/arm/boot/dts/kirkwood-nsa310a.dtb arch/arm/boot/dts/kirkwood-nsa310.dtb arch/arm/boot/dts/kirkwood-nsa320.dtb arch/arm/boot/dts/kirkwood-nsa325.dtb arch/arm/boot/dts/kirkwood-openblocks_a6.dtb arch/arm/boot/dts/kirkwood-openblocks_a7.dtb arch/arm/boot/dts/kirkwood-pogo_e02.dtb arch/arm/boot/dts/kirkwood-rd88f6192.dtb arch/arm/boot/dts/kirkwood-rs212.dtb arch/arm/boot/dts/kirkwood-rs409.dtb arch/arm/boot/dts/kirkwood-rs411.dtb arch/arm/boot/dts/kirkwood-t5325.dtb arch/arm/boot/dts/kirkwood-ts219-6281.dtb arch/arm/boot/dts/kirkwood-ts219-6282.dtb arch/arm/boot/dts/kirkwood-ts419-6281.dtb arch/arm/boot/dts/kirkwood-ts419-6282.dtb mvsdio@90000: Unevaluated properties are not allowed ('wp-gpios', 'cd-gpios', 'bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed' were unexpected) arch/arm/boot/dts/kirkwood-db-88f6281.dtb arch/arm/boot/dts/kirkwood-db-88f6282.dtb mvsdio@d4000: $nodename:0: 'mvsdio@d4000' does not match '^mmc(@.*)?$' arch/arm/boot/dts/armada-370-c200-v2.dtb arch/arm/boot/dts/armada-370-db.dtb arch/arm/boot/dts/armada-370-dlink-dns327l.dtb arch/arm/boot/dts/armada-370-mirabox.dtb arch/arm/boot/dts/armada-370-netgear-rn102.dtb arch/arm/boot/dts/armada-370-netgear-rn104.dtb arch/arm/boot/dts/armada-370-rd.dtb arch/arm/boot/dts/armada-370-seagate-nas-2bay.dtb arch/arm/boot/dts/armada-370-seagate-nas-4bay.dtb arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dtb arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtb arch/arm/boot/dts/armada-370-synology-ds213j.dtb arch/arm/boot/dts/armada-375-db.dtb arch/arm/boot/dts/armada-xp-axpwifiap.dtb arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dtb arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtb arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dtb arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtb arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dtb arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtb arch/arm/boot/dts/armada-xp-db.dtb arch/arm/boot/dts/armada-xp-db-dxbc2.dtb arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dtb arch/arm/boot/dts/armada-xp-gp.dtb arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dtb arch/arm/boot/dts/armada-xp-linksys-mamba.dtb arch/arm/boot/dts/armada-xp-matrix.dtb arch/arm/boot/dts/armada-xp-netgear-rn2120.dtb arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dtb arch/arm/boot/dts/armada-xp-synology-ds414.dtb mvsdio@d4000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'broken-cd' were unexpected) arch/arm/boot/dts/armada-370-db.dtb arch/arm/boot/dts/armada-370-mirabox.dtb arch/arm/boot/dts/armada-370-rd.dtb arch/arm/boot/dts/armada-xp-db.dtb arch/arm/boot/dts/armada-xp-db-dxbc2.dtb mvsdio@d4000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed', 'cd-gpios', 'wp-gpios' were unexpected) arch/arm/boot/dts/armada-375-db.dtb mvsdio@d4000: Unevaluated properties are not allowed ('bus-width', 'cap-sdio-irq', 'cap-sd-highspeed', 'cap-mmc-highspeed' were unexpected) arch/arm/boot/dts/armada-370-c200-v2.dtb arch/arm/boot/dts/armada-370-dlink-dns327l.dtb arch/arm/boot/dts/armada-370-netgear-rn102.dtb arch/arm/boot/dts/armada-370-netgear-rn104.dtb arch/arm/boot/dts/armada-370-seagate-nas-2bay.dtb arch/arm/boot/dts/armada-370-seagate-nas-4bay.dtb arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dtb arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtb arch/arm/boot/dts/armada-370-synology-ds213j.dtb arch/arm/boot/dts/armada-xp-axpwifiap.dtb arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dtb arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtb arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dtb arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtb arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dtb arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtb arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dtb arch/arm/boot/dts/armada-xp-gp.dtb arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dtb arch/arm/boot/dts/armada-xp-linksys-mamba.dtb arch/arm/boot/dts/armada-xp-matrix.dtb arch/arm/boot/dts/armada-xp-netgear-rn2120.dtb arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dtb arch/arm/boot/dts/armada-xp-synology-ds414.dtb ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema 2022-04-15 14:32 ` Rob Herring @ 2022-04-20 21:16 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2022-04-20 21:16 UTC (permalink / raw) To: Chris Packham Cc: sebastian.hesselbarth, ulf.hansson, linux-kernel, linux-arm-kernel, devicetree, andrew, linux-mmc, gregory.clement, krzk+dt On Fri, Apr 15, 2022 at 09:32:41AM -0500, Rob Herring wrote: > On Fri, 15 Apr 2022 11:06:02 +1200, Chris Packham wrote: > > Convert the orion-sdio binding to JSON schema. > > > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > > --- > > .../bindings/mmc/marvell,orion-sdio.yaml | 43 +++++++++++++++++++ > > .../devicetree/bindings/mmc/orion-sdio.txt | 16 ------- > > 2 files changed, 43 insertions(+), 16 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml > > delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt > > > > Running 'make dtbs_check' with the schema in this patch gives the > following warnings. Consider if they are expected or the schema is > incorrect. These may not be new warnings. > > Note that it is not yet a requirement to have 0 warnings for dtbs_check. > This will change in the future. > > Full log is available here: https://patchwork.ozlabs.org/patch/ > > > mvsdio@90000: $nodename:0: 'mvsdio@90000' does not match '^mmc(@.*)?$' Looks like all these will be fixed with patch 1, so nothing to do here. Rob ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema 2022-04-14 23:06 ` [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema Chris Packham 2022-04-15 14:32 ` Rob Herring @ 2022-04-18 11:41 ` Krzysztof Kozlowski 1 sibling, 0 replies; 11+ messages in thread From: Krzysztof Kozlowski @ 2022-04-18 11:41 UTC (permalink / raw) To: Chris Packham, ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel On 15/04/2022 01:06, Chris Packham wrote: > Convert the orion-sdio binding to JSON schema. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > .../bindings/mmc/marvell,orion-sdio.yaml | 43 +++++++++++++++++++ > .../devicetree/bindings/mmc/orion-sdio.txt | 16 ------- > 2 files changed, 43 insertions(+), 16 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml > delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt > > diff --git a/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml b/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml > new file mode 100644 > index 000000000000..4fef53fc78ed > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml > @@ -0,0 +1,43 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mmc/marvell,orion-sdio.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Marvell orion-sdio controller > + > +maintainers: > + - Ulf Hansson <ulf.hansson@linaro.org> This should be someone having taking care about this hardware, not subsystem maintainer. If there is no dedicated person for Marvell MMC, then maybe SoC maintainers? Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove to JSON schema 2022-04-14 23:05 [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema Chris Packham ` (2 preceding siblings ...) 2022-04-14 23:06 ` [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema Chris Packham @ 2022-04-14 23:06 ` Chris Packham 2022-04-14 23:33 ` Andrew Lunn 2022-04-15 14:32 ` Rob Herring 3 siblings, 2 replies; 11+ messages in thread From: Chris Packham @ 2022-04-14 23:06 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Convert the sdhci-dove binding to JSON schema. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- .../bindings/mmc/marvell,dove-sdhci.yaml | 38 +++++++++++++++++++ .../devicetree/bindings/mmc/sdhci-dove.txt | 14 ------- 2 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt diff --git a/Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml new file mode 100644 index 000000000000..b3a762b528fd --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/marvell,dove-sdhci.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell sdhci-dove controller + +maintainers: + - Ulf Hansson <ulf.hansson@linaro.org> + +allOf: + - $ref: mmc-controller.yaml# + +properties: + compatible: + const: marvell,dove-sdhci + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false + +examples: + - | + sdio0: mmc@92000 { + compatible = "marvell,dove-sdhci"; + reg = <0x92000 0x100>; + interrupts = <35>; + }; diff --git a/Documentation/devicetree/bindings/mmc/sdhci-dove.txt b/Documentation/devicetree/bindings/mmc/sdhci-dove.txt deleted file mode 100644 index ae9aab9abcd7..000000000000 --- a/Documentation/devicetree/bindings/mmc/sdhci-dove.txt +++ /dev/null @@ -1,14 +0,0 @@ -* Marvell sdhci-dove controller - -This file documents differences between the core properties in mmc.txt -and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers. - -- compatible: Should be "marvell,dove-sdhci". - -Example: - -sdio0: sdio@92000 { - compatible = "marvell,dove-sdhci"; - reg = <0x92000 0x100>; - interrupts = <35>; -}; -- 2.35.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove to JSON schema 2022-04-14 23:06 ` [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove " Chris Packham @ 2022-04-14 23:33 ` Andrew Lunn 2022-04-18 11:43 ` Krzysztof Kozlowski 2022-04-15 14:32 ` Rob Herring 1 sibling, 1 reply; 11+ messages in thread From: Andrew Lunn @ 2022-04-14 23:33 UTC (permalink / raw) To: Chris Packham Cc: ulf.hansson, robh+dt, krzk+dt, gregory.clement, sebastian.hesselbarth, linux-mmc, devicetree, linux-kernel, linux-arm-kernel Hi Chris > +required: > + - compatible > + - reg > + - interrupts https://elixir.bootlin.com/linux/latest/source/drivers/mmc/host/sdhci-dove.c#L78 https://elixir.bootlin.com/linux/latest/source/arch/arm/boot/dts/dove.dtsi#L344 Dove does actually have a clock. It looks like it is optional in the driver, but the .dtsi file has it. It is not documented in the current .txt file, so i can understand you missing it. I'm surprised the DT tools didn't complain about an unexpected property. Andrew ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove to JSON schema 2022-04-14 23:33 ` Andrew Lunn @ 2022-04-18 11:43 ` Krzysztof Kozlowski 0 siblings, 0 replies; 11+ messages in thread From: Krzysztof Kozlowski @ 2022-04-18 11:43 UTC (permalink / raw) To: Andrew Lunn, Chris Packham Cc: ulf.hansson, robh+dt, krzk+dt, gregory.clement, sebastian.hesselbarth, linux-mmc, devicetree, linux-kernel, linux-arm-kernel On 15/04/2022 01:33, Andrew Lunn wrote: > Hi Chris > >> +required: >> + - compatible >> + - reg >> + - interrupts > > https://elixir.bootlin.com/linux/latest/source/drivers/mmc/host/sdhci-dove.c#L78 > > https://elixir.bootlin.com/linux/latest/source/arch/arm/boot/dts/dove.dtsi#L344 > > Dove does actually have a clock. It looks like it is optional in the > driver, but the .dtsi file has it. It is not documented in the current > .txt file, so i can understand you missing it. > > I'm surprised the DT tools didn't complain about an unexpected > property. They did. :) It seems binding is a bit out of date, so Chris should extend/update it. Same comments about maintainer as for patch #3. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove to JSON schema 2022-04-14 23:06 ` [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove " Chris Packham 2022-04-14 23:33 ` Andrew Lunn @ 2022-04-15 14:32 ` Rob Herring 1 sibling, 0 replies; 11+ messages in thread From: Rob Herring @ 2022-04-15 14:32 UTC (permalink / raw) To: Chris Packham Cc: robh+dt, sebastian.hesselbarth, andrew, devicetree, krzk+dt, ulf.hansson, linux-kernel, linux-arm-kernel, gregory.clement, linux-mmc On Fri, 15 Apr 2022 11:06:03 +1200, Chris Packham wrote: > Convert the sdhci-dove binding to JSON schema. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > .../bindings/mmc/marvell,dove-sdhci.yaml | 38 +++++++++++++++++++ > .../devicetree/bindings/mmc/sdhci-dove.txt | 14 ------- > 2 files changed, 38 insertions(+), 14 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml > delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt > Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings. Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future. Full log is available here: https://patchwork.ozlabs.org/patch/ sdio-host@90000: $nodename:0: 'sdio-host@90000' does not match '^mmc(@.*)?$' arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-cubox-es.dtb arch/arm/boot/dts/dove-d2plug.dtb arch/arm/boot/dts/dove-d3plug.dtb arch/arm/boot/dts/dove-dove-db.dtb arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@90000: interrupts: [[36], [38]] is too long arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-cubox-es.dtb arch/arm/boot/dts/dove-d2plug.dtb arch/arm/boot/dts/dove-d3plug.dtb arch/arm/boot/dts/dove-dove-db.dtb arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@90000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'non-removable', 'bus-width' were unexpected) arch/arm/boot/dts/dove-d2plug.dtb sdio-host@90000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'non-removable', 'vmmc-supply', 'reset-gpio' were unexpected) arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@90000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'non-removable' were unexpected) arch/arm/boot/dts/dove-d3plug.dtb sdio-host@90000: Unevaluated properties are not allowed ('interrupts', 'clocks' were unexpected) arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-cubox-es.dtb arch/arm/boot/dts/dove-dove-db.dtb sdio-host@92000: $nodename:0: 'sdio-host@92000' does not match '^mmc(@.*)?$' arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-cubox-es.dtb arch/arm/boot/dts/dove-d2plug.dtb arch/arm/boot/dts/dove-d3plug.dtb arch/arm/boot/dts/dove-dove-db.dtb arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@92000: interrupts: [[35], [37]] is too long arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-cubox-es.dtb arch/arm/boot/dts/dove-d2plug.dtb arch/arm/boot/dts/dove-d3plug.dtb arch/arm/boot/dts/dove-dove-db.dtb arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@92000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'cd-gpios' were unexpected) arch/arm/boot/dts/dove-cubox-es.dtb sdio-host@92000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'non-removable', 'bus-width' were unexpected) arch/arm/boot/dts/dove-d2plug.dtb arch/arm/boot/dts/dove-d3plug.dtb sdio-host@92000: Unevaluated properties are not allowed ('interrupts', 'clocks', 'vmmc-supply', 'wp-gpios' were unexpected) arch/arm/boot/dts/dove-sbc-a510.dtb sdio-host@92000: Unevaluated properties are not allowed ('interrupts', 'clocks' were unexpected) arch/arm/boot/dts/dove-cubox.dtb arch/arm/boot/dts/dove-dove-db.dtb ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-04-20 21:16 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-04-14 23:05 [PATCH 0/4] dt-bindings: mmc: Convert orion/dove bindings to JSON schema Chris Packham 2022-04-14 23:06 ` [PATCH 1/4] ARM: dts: mvebu: Update mvsdio node names to match schema Chris Packham 2022-04-14 23:06 ` [PATCH 2/4] ARM: dts: dove: Update sdio-host " Chris Packham 2022-04-14 23:06 ` [PATCH 3/4] dt-bindings: mmc: convert orion-sdio to JSON schema Chris Packham 2022-04-15 14:32 ` Rob Herring 2022-04-20 21:16 ` Rob Herring 2022-04-18 11:41 ` Krzysztof Kozlowski 2022-04-14 23:06 ` [PATCH 4/4] dt-bindings: mmc: convert sdhci-dove " Chris Packham 2022-04-14 23:33 ` Andrew Lunn 2022-04-18 11:43 ` Krzysztof Kozlowski 2022-04-15 14:32 ` Rob Herring
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).