* [PATCH v4 0/2] mmc: xenon: Convert to JSON schema @ 2022-03-29 0:02 Chris Packham 2022-03-29 0:02 ` [PATCH v4 1/2] arm64: dts: marvell: Update sdhci node names to match schema Chris Packham 2022-03-29 0:02 ` [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema Chris Packham 0 siblings, 2 replies; 8+ messages in thread From: Chris Packham @ 2022-03-29 0:02 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, huziji, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham This series converts the xenon-sdhci-binding to JSON schema. There are some schema violations with the clock nodes for the existing dts. It's unclear whether the ap806/ap807 actually need the 2nd clock but the change that introduced the requirement to the old binding was fairly explicit about this being required for cp110 and ap806. Chris Packham (2): arm64: dts: marvell: Update sdhci node names to match schema dt-bindings: mmc: xenon: Convert to JSON schema .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ MAINTAINERS | 2 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +- arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +- 6 files changed, 280 insertions(+), 178 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 1/2] arm64: dts: marvell: Update sdhci node names to match schema 2022-03-29 0:02 [PATCH v4 0/2] mmc: xenon: Convert to JSON schema Chris Packham @ 2022-03-29 0:02 ` Chris Packham 2022-03-29 0:02 ` [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema Chris Packham 1 sibling, 0 replies; 8+ messages in thread From: Chris Packham @ 2022-03-29 0:02 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, huziji, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Update the node names of the sdhci@ 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> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> --- Notes: This has been sent separately [1] but on Krzysztof's advice I've included it in v3 of this series. [1] - https://lore.kernel.org/linux-arm-kernel/20220321212007.2961581-1-chris.packham@alliedtelesis.co.nz/ Changes in v4: - None Changes in v3: - New arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 30233de58bb3..78adb803df26 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -434,7 +434,7 @@ rwtm: mailbox@b0000 { #mbox-cells = <1>; }; - sdhci1: sdhci@d0000 { + sdhci1: mmc@d0000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd0000 0x300>, @@ -445,7 +445,7 @@ sdhci1: sdhci@d0000 { status = "disabled"; }; - sdhci0: sdhci@d8000 { + sdhci0: mmc@d8000 { compatible = "marvell,armada-3700-sdhci", "marvell,sdhci-xenon"; reg = <0xd8000 0x300>, diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi index 6614472100c2..a06a0a889c43 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi @@ -250,7 +250,7 @@ watchdog: watchdog@610000 { interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; }; - ap_sdhci0: sdhci@6e0000 { + ap_sdhci0: mmc@6e0000 { compatible = "marvell,armada-ap806-sdhci"; reg = <0x6e0000 0x300>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 3bd2182817fb..d6c0990a267d 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -493,7 +493,7 @@ CP11X_LABEL(trng): trng@760000 { status = "okay"; }; - CP11X_LABEL(sdhci0): sdhci@780000 { + CP11X_LABEL(sdhci0): mmc@780000 { compatible = "marvell,armada-cp110-sdhci"; reg = <0x780000 0x300>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH>; -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-29 0:02 [PATCH v4 0/2] mmc: xenon: Convert to JSON schema Chris Packham 2022-03-29 0:02 ` [PATCH v4 1/2] arm64: dts: marvell: Update sdhci node names to match schema Chris Packham @ 2022-03-29 0:02 ` Chris Packham 2022-03-29 11:50 ` Rob Herring 1 sibling, 1 reply; 8+ messages in thread From: Chris Packham @ 2022-03-29 0:02 UTC (permalink / raw) To: ulf.hansson, robh+dt, krzk+dt, huziji, andrew, gregory.clement, sebastian.hesselbarth Cc: linux-mmc, devicetree, linux-kernel, linux-arm-kernel, Chris Packham Convert the marvell,xenon-sdhci binding to JSON schema. Currently the in-tree dts files don't validate because they use sdhci@ instead of mmc@ as required by the generic mmc-controller schema. The compatible "marvell,sdhci-xenon" was not documented in the old binding but it accompanies the of "marvell,armada-3700-sdhci" in the armada-37xx SoC dtsi so this combination is added to the new binding document. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> --- Notes: Changes in v4: - Add review from Krzysztof - Squash in addition of marvell,sdhci-xenon with an explanation in the commit message Changes in v3: - Don't accept ap807 without ap806 - Add ref: string for pad-type Changes in v2: - Update MAINTAINERS entry - Incorporate feedback from Krzysztof .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 276 insertions(+), 174 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt deleted file mode 100644 index c51a62d751dc..000000000000 --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt +++ /dev/null @@ -1,173 +0,0 @@ -Marvell Xenon SDHCI Controller device tree bindings -This file documents differences between the core mmc properties -described by mmc.txt and the properties used by the Xenon implementation. - -Multiple SDHCs might be put into a single Xenon IP, to save size and cost. -Each SDHC is independent and owns independent resources, such as register sets, -clock and PHY. -Each SDHC should have an independent device tree node. - -Required Properties: -- compatible: should be one of the following - - "marvell,armada-3700-sdhci": For controllers on Armada-3700 SoC. - Must provide a second register area and marvell,pad-type. - - "marvell,armada-ap806-sdhci": For controllers on Armada AP806. - - "marvell,armada-ap807-sdhci": For controllers on Armada AP807. - - "marvell,armada-cp110-sdhci": For controllers on Armada CP110. - -- clocks: - Array of clocks required for SDHC. - Require at least input clock for Xenon IP core. For Armada AP806 and - CP110, the AXI clock is also mandatory. - -- clock-names: - Array of names corresponding to clocks property. - The input clock for Xenon IP core should be named as "core". - The input clock for the AXI bus must be named as "axi". - -- reg: - * For "marvell,armada-3700-sdhci", two register areas. - The first one for Xenon IP register. The second one for the Armada 3700 SoC - PHY PAD Voltage Control register. - Please follow the examples with compatible "marvell,armada-3700-sdhci" - in below. - Please also check property marvell,pad-type in below. - - * For other compatible strings, one register area for Xenon IP. - -Optional Properties: -- marvell,xenon-sdhc-id: - Indicate the corresponding bit index of current SDHC in - SDHC System Operation Control Register Bit[7:0]. - Set/clear the corresponding bit to enable/disable current SDHC. - If Xenon IP contains only one SDHC, this property is optional. - -- marvell,xenon-phy-type: - Xenon support multiple types of PHYs. - To select eMMC 5.1 PHY, set: - marvell,xenon-phy-type = "emmc 5.1 phy" - eMMC 5.1 PHY is the default choice if this property is not provided. - To select eMMC 5.0 PHY, set: - marvell,xenon-phy-type = "emmc 5.0 phy" - - All those types of PHYs can support eMMC, SD and SDIO. - Please note that this property only presents the type of PHY. - It doesn't stand for the entire SDHC type or property. - For example, "emmc 5.1 phy" doesn't mean that this Xenon SDHC only - supports eMMC 5.1. - -- marvell,xenon-phy-znr: - Set PHY ZNR value. - Only available for eMMC PHY. - Valid range = [0:0x1F]. - ZNR is set as 0xF by default if this property is not provided. - -- marvell,xenon-phy-zpr: - Set PHY ZPR value. - Only available for eMMC PHY. - Valid range = [0:0x1F]. - ZPR is set as 0xF by default if this property is not provided. - -- marvell,xenon-phy-nr-success-tun: - Set the number of required consecutive successful sampling points - used to identify a valid sampling window, in tuning process. - Valid range = [1:7]. - Set as 0x4 by default if this property is not provided. - -- marvell,xenon-phy-tun-step-divider: - Set the divider for calculating TUN_STEP. - Set as 64 by default if this property is not provided. - -- marvell,xenon-phy-slow-mode: - If this property is selected, transfers will bypass PHY. - Only available when bus frequency lower than 55MHz in SDR mode. - Disabled by default. Please only try this property if timing issues - always occur with PHY enabled in eMMC HS SDR, SD SDR12, SD SDR25, - SD Default Speed and HS mode and eMMC legacy speed mode. - -- marvell,xenon-tun-count: - Xenon SDHC SoC usually doesn't provide re-tuning counter in - Capabilities Register 3 Bit[11:8]. - This property provides the re-tuning counter. - If this property is not set, default re-tuning counter will - be set as 0x9 in driver. - -- marvell,pad-type: - Type of Armada 3700 SoC PHY PAD Voltage Controller register. - Only valid when "marvell,armada-3700-sdhci" is selected. - Two types: "sd" and "fixed-1-8v". - If "sd" is selected, SoC PHY PAD is set as 3.3V at the beginning and is - switched to 1.8V when later in higher speed mode. - If "fixed-1-8v" is selected, SoC PHY PAD is fixed 1.8V, such as for eMMC. - Please follow the examples with compatible "marvell,armada-3700-sdhci" - in below. - -Example: -- For eMMC: - - sdhci@aa0000 { - compatible = "marvell,armada-ap806-sdhci"; - reg = <0xaa0000 0x1000>; - interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH> - clocks = <&emmc_clk>,<&axi_clk>; - clock-names = "core", "axi"; - bus-width = <4>; - marvell,xenon-phy-slow-mode; - marvell,xenon-tun-count = <11>; - non-removable; - no-sd; - no-sdio; - - /* Vmmc and Vqmmc are both fixed */ - }; - -- For SD/SDIO: - - sdhci@ab0000 { - compatible = "marvell,armada-cp110-sdhci"; - reg = <0xab0000 0x1000>; - interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH> - vqmmc-supply = <&sd_vqmmc_regulator>; - vmmc-supply = <&sd_vmmc_regulator>; - clocks = <&sdclk>, <&axi_clk>; - clock-names = "core", "axi"; - bus-width = <4>; - marvell,xenon-tun-count = <9>; - }; - -- For eMMC with compatible "marvell,armada-3700-sdhci": - - sdhci@aa0000 { - compatible = "marvell,armada-3700-sdhci"; - reg = <0xaa0000 0x1000>, - <phy_addr 0x4>; - interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH> - clocks = <&emmcclk>; - clock-names = "core"; - bus-width = <8>; - mmc-ddr-1_8v; - mmc-hs400-1_8v; - non-removable; - no-sd; - no-sdio; - - /* Vmmc and Vqmmc are both fixed */ - - marvell,pad-type = "fixed-1-8v"; - }; - -- For SD/SDIO with compatible "marvell,armada-3700-sdhci": - - sdhci@ab0000 { - compatible = "marvell,armada-3700-sdhci"; - reg = <0xab0000 0x1000>, - <phy_addr 0x4>; - interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH> - vqmmc-supply = <&sd_regulator>; - /* Vmmc is fixed */ - clocks = <&sdclk>; - clock-names = "core"; - bus-width = <4>; - - marvell,pad-type = "sd"; - }; diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml new file mode 100644 index 000000000000..3079ca018b51 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml @@ -0,0 +1,275 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/marvell,xenon-sdhci.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell Xenon SDHCI Controller + +description: | + This file documents differences between the core MMC properties described by + mmc-controller.yaml and the properties used by the Xenon implementation. + + Multiple SDHCs might be put into a single Xenon IP, to save size and cost. + Each SDHC is independent and owns independent resources, such as register + sets, clock and PHY. + + Each SDHC should have an independent device tree node. + +maintainers: + - Ulf Hansson <ulf.hansson@linaro.org> + +properties: + compatible: + oneOf: + - enum: + - marvell,armada-cp110-sdhci + - marvell,armada-ap806-sdhci + + - items: + - const: marvell,armada-ap807-sdhci + - const: marvell,armada-ap806-sdhci + + - items: + - const: marvell,armada-3700-sdhci + - const: marvell,sdhci-xenon + + reg: + minItems: 1 + maxItems: 2 + description: | + For "marvell,armada-3700-sdhci", two register areas. The first one + for Xenon IP register. The second one for the Armada 3700 SoC PHY PAD + Voltage Control register. Please follow the examples with compatible + "marvell,armada-3700-sdhci" in below. + Please also check property marvell,pad-type in below. + + For other compatible strings, one register area for Xenon IP. + + clocks: + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + items: + - const: core + - const: axi + + marvell,xenon-sdhc-id: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 7 + description: | + Indicate the corresponding bit index of current SDHC in SDHC System + Operation Control Register Bit[7:0]. Set/clear the corresponding bit to + enable/disable current SDHC. + + marvell,xenon-phy-type: + $ref: /schemas/types.yaml#/definitions/string + enum: + - "emmc 5.1 phy" + - "emmc 5.0 phy" + description: | + Xenon support multiple types of PHYs. To select eMMC 5.1 PHY, set: + marvell,xenon-phy-type = "emmc 5.1 phy" eMMC 5.1 PHY is the default + choice if this property is not provided. To select eMMC 5.0 PHY, set: + marvell,xenon-phy-type = "emmc 5.0 phy" + + All those types of PHYs can support eMMC, SD and SDIO. Please note that + this property only presents the type of PHY. It doesn't stand for the + entire SDHC type or property. For example, "emmc 5.1 phy" doesn't mean + that this Xenon SDHC only supports eMMC 5.1. + + marvell,xenon-phy-znr: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 0x1f + default: 0xf + description: | + Set PHY ZNR value. + Only available for eMMC PHY. + + marvell,xenon-phy-zpr: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 0x1f + default: 0xf + description: | + Set PHY ZPR value. + Only available for eMMC PHY. + + marvell,xenon-phy-nr-success-tun: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 7 + default: 0x4 + description: | + Set the number of required consecutive successful sampling points + used to identify a valid sampling window, in tuning process. + + marvell,xenon-phy-tun-step-divider: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 64 + description: | + Set the divider for calculating TUN_STEP. + + marvell,xenon-phy-slow-mode: + type: boolean + description: | + If this property is selected, transfers will bypass PHY. + Only available when bus frequency lower than 55MHz in SDR mode. + Disabled by default. Please only try this property if timing issues + always occur with PHY enabled in eMMC HS SDR, SD SDR12, SD SDR25, + SD Default Speed and HS mode and eMMC legacy speed mode. + + marvell,xenon-tun-count: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 0x9 + description: | + Xenon SDHC SoC usually doesn't provide re-tuning counter in + Capabilities Register 3 Bit[11:8]. + This property provides the re-tuning counter. + +allOf: + - $ref: mmc-controller.yaml# + - if: + properties: + compatible: + contains: + const: marvell,armada-3700-sdhci + + then: + properties: + reg: + items: + - description: Xenon IP registers + - description: Armada 3700 SoC PHY PAD Voltage Control register + minItems: 2 + + marvell,pad-type: + $ref: /schemas/types.yaml#/definitions/string + enum: + - sd + - fixed-1-8v + description: | + Type of Armada 3700 SoC PHY PAD Voltage Controller register. + If "sd" is selected, SoC PHY PAD is set as 3.3V at the beginning + and is switched to 1.8V when later in higher speed mode. + If "fixed-1-8v" is selected, SoC PHY PAD is fixed 1.8V, such as for + eMMC. + Please follow the examples with compatible + "marvell,armada-3700-sdhci" in below. + + required: + - marvell,pad-type + + - if: + properties: + compatible: + contains: + enum: + - marvell,armada-cp110-sdhci + - marvell,armada-ap807-sdhci + - marvell,armada-ap806-sdhci + + then: + properties: + clocks: + minItems: 2 + + clock-names: + items: + - const: core + - const: axi + + +required: + - compatible + - reg + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + // For eMMC + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + mmc@aa0000 { + compatible = "marvell,armada-ap807-sdhci", "marvell,armada-ap806-sdhci"; + reg = <0xaa0000 0x1000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&emmc_clk 0>, <&axi_clk 0>; + clock-names = "core", "axi"; + bus-width = <4>; + marvell,xenon-phy-slow-mode; + marvell,xenon-tun-count = <11>; + non-removable; + no-sd; + no-sdio; + + /* Vmmc and Vqmmc are both fixed */ + }; + + - | + // For SD/SDIO + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + mmc@ab0000 { + compatible = "marvell,armada-cp110-sdhci"; + reg = <0xab0000 0x1000>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + vqmmc-supply = <&sd_vqmmc_regulator>; + vmmc-supply = <&sd_vmmc_regulator>; + clocks = <&sdclk 0>, <&axi_clk 0>; + clock-names = "core", "axi"; + bus-width = <4>; + marvell,xenon-tun-count = <9>; + }; + + - | + // For eMMC with compatible "marvell,armada-3700-sdhci": + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + mmc@aa0000 { + compatible = "marvell,armada-3700-sdhci"; + reg = <0xaa0000 0x1000>, + <0x17808 0x4>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&emmcclk 0>; + clock-names = "core"; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + non-removable; + no-sd; + no-sdio; + + /* Vmmc and Vqmmc are both fixed */ + + marvell,pad-type = "fixed-1-8v"; + }; + + - | + // For SD/SDIO with compatible "marvell,armada-3700-sdhci": + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + mmc@ab0000 { + compatible = "marvell,armada-3700-sdhci"; + reg = <0xab0000 0x1000>, + <0x17808 0x4>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + vqmmc-supply = <&sd_regulator>; + /* Vmmc is fixed */ + clocks = <&sdclk 0>; + clock-names = "core"; + bus-width = <4>; + + marvell,pad-type = "sd"; + }; diff --git a/MAINTAINERS b/MAINTAINERS index b555a5e8704f..95921c86aa82 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11706,7 +11706,7 @@ MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER M: Hu Ziji <huziji@marvell.com> L: linux-mmc@vger.kernel.org S: Supported -F: Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt +F: Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml F: drivers/mmc/host/sdhci-xenon* MATROX FRAMEBUFFER DRIVER -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-29 0:02 ` [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema Chris Packham @ 2022-03-29 11:50 ` Rob Herring 2022-03-29 13:14 ` Krzysztof Kozlowski 0 siblings, 1 reply; 8+ messages in thread From: Rob Herring @ 2022-03-29 11:50 UTC (permalink / raw) To: Chris Packham Cc: andrew, ulf.hansson, linux-arm-kernel, sebastian.hesselbarth, gregory.clement, linux-mmc, linux-kernel, krzk+dt, huziji, robh+dt, devicetree On Tue, 29 Mar 2022 13:02:31 +1300, Chris Packham wrote: > Convert the marvell,xenon-sdhci binding to JSON schema. Currently the > in-tree dts files don't validate because they use sdhci@ instead of mmc@ > as required by the generic mmc-controller schema. > > The compatible "marvell,sdhci-xenon" was not documented in the old > binding but it accompanies the of "marvell,armada-3700-sdhci" in the > armada-37xx SoC dtsi so this combination is added to the new binding > document. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > > Notes: > Changes in v4: > - Add review from Krzysztof > - Squash in addition of marvell,sdhci-xenon with an explanation in the > commit message > Changes in v3: > - Don't accept ap807 without ap806 > - Add ref: string for pad-type > Changes in v2: > - Update MAINTAINERS entry > - Incorporate feedback from Krzysztof > > .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- > .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 276 insertions(+), 174 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt > create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@aa0000: compatible: 'oneOf' conditional failed, one must be fixed: ['marvell,armada-3700-sdhci'] is too short 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] 'marvell,armada-ap807-sdhci' was expected From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@ab0000: compatible: 'oneOf' conditional failed, one must be fixed: ['marvell,armada-3700-sdhci'] is too short 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] 'marvell,armada-ap807-sdhci' was expected From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1610447 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-29 11:50 ` Rob Herring @ 2022-03-29 13:14 ` Krzysztof Kozlowski 2022-03-29 19:50 ` Chris Packham 0 siblings, 1 reply; 8+ messages in thread From: Krzysztof Kozlowski @ 2022-03-29 13:14 UTC (permalink / raw) To: Rob Herring, Chris Packham Cc: andrew, ulf.hansson, linux-arm-kernel, sebastian.hesselbarth, gregory.clement, linux-mmc, linux-kernel, krzk+dt, huziji, robh+dt, devicetree On 29/03/2022 13:50, Rob Herring wrote: > On Tue, 29 Mar 2022 13:02:31 +1300, Chris Packham wrote: >> Convert the marvell,xenon-sdhci binding to JSON schema. Currently the >> in-tree dts files don't validate because they use sdhci@ instead of mmc@ >> as required by the generic mmc-controller schema. >> >> The compatible "marvell,sdhci-xenon" was not documented in the old >> binding but it accompanies the of "marvell,armada-3700-sdhci" in the >> armada-37xx SoC dtsi so this combination is added to the new binding >> document. >> >> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> >> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> >> --- >> >> Notes: >> Changes in v4: >> - Add review from Krzysztof >> - Squash in addition of marvell,sdhci-xenon with an explanation in the >> commit message >> Changes in v3: >> - Don't accept ap807 without ap806 >> - Add ref: string for pad-type >> Changes in v2: >> - Update MAINTAINERS entry >> - Incorporate feedback from Krzysztof >> >> .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- >> .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ >> MAINTAINERS | 2 +- >> 3 files changed, 276 insertions(+), 174 deletions(-) >> delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt >> create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >> > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@aa0000: compatible: 'oneOf' conditional failed, one must be fixed: > ['marvell,armada-3700-sdhci'] is too short > 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] > 'marvell,armada-ap807-sdhci' was expected > From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@ab0000: compatible: 'oneOf' conditional failed, one must be fixed: > ['marvell,armada-3700-sdhci'] is too short > 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] > 'marvell,armada-ap807-sdhci' was expected > From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > > doc reference errors (make refcheckdocs): Chris, your own dt binding does not pass it's check (example)... After updating the compatibles, you need to check the example. The examples are anyway duplicating common stuff, so half of them could be removed. Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-29 13:14 ` Krzysztof Kozlowski @ 2022-03-29 19:50 ` Chris Packham 2022-03-30 14:40 ` Rob Herring 0 siblings, 1 reply; 8+ messages in thread From: Chris Packham @ 2022-03-29 19:50 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring Cc: andrew@lunn.ch, ulf.hansson@linaro.org, linux-arm-kernel@lists.infradead.org, sebastian.hesselbarth@gmail.com, gregory.clement@bootlin.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, krzk+dt@kernel.org, huziji@marvell.com, robh+dt@kernel.org, devicetree@vger.kernel.org On 30/03/22 02:14, Krzysztof Kozlowski wrote: > On 29/03/2022 13:50, Rob Herring wrote: >> On Tue, 29 Mar 2022 13:02:31 +1300, Chris Packham wrote: >>> Convert the marvell,xenon-sdhci binding to JSON schema. Currently the >>> in-tree dts files don't validate because they use sdhci@ instead of mmc@ >>> as required by the generic mmc-controller schema. >>> >>> The compatible "marvell,sdhci-xenon" was not documented in the old >>> binding but it accompanies the of "marvell,armada-3700-sdhci" in the >>> armada-37xx SoC dtsi so this combination is added to the new binding >>> document. >>> >>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> >>> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> >>> --- >>> >>> Notes: >>> Changes in v4: >>> - Add review from Krzysztof >>> - Squash in addition of marvell,sdhci-xenon with an explanation in the >>> commit message >>> Changes in v3: >>> - Don't accept ap807 without ap806 >>> - Add ref: string for pad-type >>> Changes in v2: >>> - Update MAINTAINERS entry >>> - Incorporate feedback from Krzysztof >>> >>> .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- >>> .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ >>> MAINTAINERS | 2 +- >>> 3 files changed, 276 insertions(+), 174 deletions(-) >>> delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt >>> create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >>> >> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' >> on your patch (DT_CHECKER_FLAGS is new in v5.13): >> >> yamllint warnings/errors: >> >> dtschema/dtc warnings/errors: >> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@aa0000: compatible: 'oneOf' conditional failed, one must be fixed: >> ['marvell,armada-3700-sdhci'] is too short >> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] >> 'marvell,armada-ap807-sdhci' was expected >> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@ab0000: compatible: 'oneOf' conditional failed, one must be fixed: >> ['marvell,armada-3700-sdhci'] is too short >> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] >> 'marvell,armada-ap807-sdhci' was expected >> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >> >> doc reference errors (make refcheckdocs): > Chris, your own dt binding does not pass it's check (example)... > > After updating the compatibles, you need to check the example. The > examples are anyway duplicating common stuff, so half of them could be > removed. Yeah silly me. I started taking short cuts to run dt_binding_check dtbs_check as one command but then the dt_bindings_check output scrolled off the top of my terminal. As for the examples themselves I want to leave what's there as a fairly direct translation of the old binding. If we consider them unnecessary removing them can be done as a follow-up. > > Best regards, > Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-29 19:50 ` Chris Packham @ 2022-03-30 14:40 ` Rob Herring 2022-03-31 20:09 ` Chris Packham 0 siblings, 1 reply; 8+ messages in thread From: Rob Herring @ 2022-03-30 14:40 UTC (permalink / raw) To: Chris Packham Cc: Krzysztof Kozlowski, andrew@lunn.ch, ulf.hansson@linaro.org, linux-arm-kernel@lists.infradead.org, sebastian.hesselbarth@gmail.com, gregory.clement@bootlin.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, krzk+dt@kernel.org, huziji@marvell.com, devicetree@vger.kernel.org On Tue, Mar 29, 2022 at 07:50:59PM +0000, Chris Packham wrote: > > On 30/03/22 02:14, Krzysztof Kozlowski wrote: > > On 29/03/2022 13:50, Rob Herring wrote: > >> On Tue, 29 Mar 2022 13:02:31 +1300, Chris Packham wrote: > >>> Convert the marvell,xenon-sdhci binding to JSON schema. Currently the > >>> in-tree dts files don't validate because they use sdhci@ instead of mmc@ > >>> as required by the generic mmc-controller schema. > >>> > >>> The compatible "marvell,sdhci-xenon" was not documented in the old > >>> binding but it accompanies the of "marvell,armada-3700-sdhci" in the > >>> armada-37xx SoC dtsi so this combination is added to the new binding > >>> document. > >>> > >>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > >>> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> > >>> --- > >>> > >>> Notes: > >>> Changes in v4: > >>> - Add review from Krzysztof > >>> - Squash in addition of marvell,sdhci-xenon with an explanation in the > >>> commit message > >>> Changes in v3: > >>> - Don't accept ap807 without ap806 > >>> - Add ref: string for pad-type > >>> Changes in v2: > >>> - Update MAINTAINERS entry > >>> - Incorporate feedback from Krzysztof > >>> > >>> .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- > >>> .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ > >>> MAINTAINERS | 2 +- > >>> 3 files changed, 276 insertions(+), 174 deletions(-) > >>> delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt > >>> create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > >>> > >> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > >> on your patch (DT_CHECKER_FLAGS is new in v5.13): > >> > >> yamllint warnings/errors: > >> > >> dtschema/dtc warnings/errors: > >> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@aa0000: compatible: 'oneOf' conditional failed, one must be fixed: > >> ['marvell,armada-3700-sdhci'] is too short > >> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] > >> 'marvell,armada-ap807-sdhci' was expected > >> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > >> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@ab0000: compatible: 'oneOf' conditional failed, one must be fixed: > >> ['marvell,armada-3700-sdhci'] is too short > >> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] > >> 'marvell,armada-ap807-sdhci' was expected > >> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > >> > >> doc reference errors (make refcheckdocs): > > Chris, your own dt binding does not pass it's check (example)... > > > > After updating the compatibles, you need to check the example. The > > examples are anyway duplicating common stuff, so half of them could be > > removed. > > Yeah silly me. I started taking short cuts to run dt_binding_check > dtbs_check as one command but then the dt_bindings_check output scrolled > off the top of my terminal. > > As for the examples themselves I want to leave what's there as a fairly > direct translation of the old binding. If we consider them unnecessary > removing them can be done as a follow-up. The examples cannot have warnings/errors. Rob _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema 2022-03-30 14:40 ` Rob Herring @ 2022-03-31 20:09 ` Chris Packham 0 siblings, 0 replies; 8+ messages in thread From: Chris Packham @ 2022-03-31 20:09 UTC (permalink / raw) To: Rob Herring Cc: Krzysztof Kozlowski, andrew@lunn.ch, ulf.hansson@linaro.org, linux-arm-kernel@lists.infradead.org, sebastian.hesselbarth@gmail.com, gregory.clement@bootlin.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, krzk+dt@kernel.org, huziji@marvell.com, devicetree@vger.kernel.org Hi Rob, On 31/03/22 03:40, Rob Herring wrote: > On Tue, Mar 29, 2022 at 07:50:59PM +0000, Chris Packham wrote: >> On 30/03/22 02:14, Krzysztof Kozlowski wrote: >>> On 29/03/2022 13:50, Rob Herring wrote: >>>> On Tue, 29 Mar 2022 13:02:31 +1300, Chris Packham wrote: >>>>> Convert the marvell,xenon-sdhci binding to JSON schema. Currently the >>>>> in-tree dts files don't validate because they use sdhci@ instead of mmc@ >>>>> as required by the generic mmc-controller schema. >>>>> >>>>> The compatible "marvell,sdhci-xenon" was not documented in the old >>>>> binding but it accompanies the of "marvell,armada-3700-sdhci" in the >>>>> armada-37xx SoC dtsi so this combination is added to the new binding >>>>> document. >>>>> >>>>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> >>>>> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> >>>>> --- >>>>> >>>>> Notes: >>>>> Changes in v4: >>>>> - Add review from Krzysztof >>>>> - Squash in addition of marvell,sdhci-xenon with an explanation in the >>>>> commit message >>>>> Changes in v3: >>>>> - Don't accept ap807 without ap806 >>>>> - Add ref: string for pad-type >>>>> Changes in v2: >>>>> - Update MAINTAINERS entry >>>>> - Incorporate feedback from Krzysztof >>>>> >>>>> .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ----------- >>>>> .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 ++++++++++++++++++ >>>>> MAINTAINERS | 2 +- >>>>> 3 files changed, 276 insertions(+), 174 deletions(-) >>>>> delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt >>>>> create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >>>>> >>>> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' >>>> on your patch (DT_CHECKER_FLAGS is new in v5.13): >>>> >>>> yamllint warnings/errors: >>>> >>>> dtschema/dtc warnings/errors: >>>> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@aa0000: compatible: 'oneOf' conditional failed, one must be fixed: >>>> ['marvell,armada-3700-sdhci'] is too short >>>> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] >>>> 'marvell,armada-ap807-sdhci' was expected >>>> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >>>> /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.example.dt.yaml: mmc@ab0000: compatible: 'oneOf' conditional failed, one must be fixed: >>>> ['marvell,armada-3700-sdhci'] is too short >>>> 'marvell,armada-3700-sdhci' is not one of ['marvell,armada-cp110-sdhci', 'marvell,armada-ap806-sdhci'] >>>> 'marvell,armada-ap807-sdhci' was expected >>>> From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml >>>> >>>> doc reference errors (make refcheckdocs): >>> Chris, your own dt binding does not pass it's check (example)... >>> >>> After updating the compatibles, you need to check the example. The >>> examples are anyway duplicating common stuff, so half of them could be >>> removed. >> Yeah silly me. I started taking short cuts to run dt_binding_check >> dtbs_check as one command but then the dt_bindings_check output scrolled >> off the top of my terminal. >> >> As for the examples themselves I want to leave what's there as a fairly >> direct translation of the old binding. If we consider them unnecessary >> removing them can be done as a follow-up. > The examples cannot have warnings/errors. I was referring to the comment of removing examples. The v5 of this series addressed the error in the example. > Rob _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-31 20:11 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-03-29 0:02 [PATCH v4 0/2] mmc: xenon: Convert to JSON schema Chris Packham 2022-03-29 0:02 ` [PATCH v4 1/2] arm64: dts: marvell: Update sdhci node names to match schema Chris Packham 2022-03-29 0:02 ` [PATCH v4 2/2] dt-bindings: mmc: xenon: Convert to JSON schema Chris Packham 2022-03-29 11:50 ` Rob Herring 2022-03-29 13:14 ` Krzysztof Kozlowski 2022-03-29 19:50 ` Chris Packham 2022-03-30 14:40 ` Rob Herring 2022-03-31 20:09 ` Chris Packham
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).