| Message ID | 20240920-topic-amlogic-arm32-upstream-bindings-fixes-convert-meson-mx-sdio-v2-3-5aa8bdfe01af@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: mmc: document mmc-slot and convert amlogic,meson-mx-sdio.txt to dtschema | expand |
On Fri, Sep 20, 2024 at 10:38:05AM +0200, Neil Armstrong wrote: > Convert the Amlogic Meson6, Meson8 and Meson8b SDIO/MMC controller > bindings to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> ... > +properties: > + compatible: > + items: > + - enum: > + - amlogic,meson8-sdio > + - amlogic,meson8b-sdio > + - const: amlogic,meson-mx-sdio > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + clocks: > + maxItems: 2 > + > + clock-names: > + items: > + - const: core > + - const: clkin > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > +patternProperties: > + "slot@[0-2]+$": ^slot@[0-2]$ (because foo-slot@22 is wrong) > + $ref: mmc-slot.yaml# > + description: > + A node for each slot provided by the MMC controller > + > + properties: > + reg: > + description: > + the slot (or "port") ID Drop description. Should be rather part of mmc-slot.yaml. > + enum: [0, 1, 2] > + > + bus-width: > + enum: [1, 4] > + > + unevaluatedProperties: false Hm, I wonder why not all slots are defined in your DTS? Why not all of them are required? I assume the slots are there always, as part of the controller. Is this because of driver limitation mentioned in the old binding? > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - "#address-cells" > + - "#size-cells" > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + mmc@c1108c20 { > + compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio"; > + reg = <0xc1108c20 0x20>; > + interrupts = <GIC_SPI 28 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clk_core>, <&clk_in>; > + clock-names = "core", "clkin"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + slot@1 { > + compatible = "mmc-slot"; > + reg = <1>; > + bus-width = <4>; Best regards, Krzysztof
Hi Krzysztof, On Tue, Sep 24, 2024 at 11:18 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: [...] > > + enum: [0, 1, 2] > > + > > + bus-width: > > + enum: [1, 4] > > + > > + unevaluatedProperties: false > > Hm, I wonder why not all slots are defined in your DTS? Why not all of > them are required? I assume the slots are there always, as part of the > controller. > > Is this because of driver limitation mentioned in the old binding? The MMC core (still) has a limitation of only supporting one slot per controller - so a limitation will stay in place. However, the driver (drivers/mmc/host/meson-mx-sdio.c) uses of_get_compatible_child(), meaning it will also pick the first child node with the correct compatible string, even if it has status = "disabled". I can send a patch to reduce the scope of this limitation: all slots can be defined but only the first enabled one is used. What do you think? Best regards, Martin
On 25/09/2024 19:29, Martin Blumenstingl wrote: > Hi Krzysztof, > > On Tue, Sep 24, 2024 at 11:18 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > [...] >>> + enum: [0, 1, 2] >>> + >>> + bus-width: >>> + enum: [1, 4] >>> + >>> + unevaluatedProperties: false >> >> Hm, I wonder why not all slots are defined in your DTS? Why not all of >> them are required? I assume the slots are there always, as part of the >> controller. >> >> Is this because of driver limitation mentioned in the old binding? > The MMC core (still) has a limitation of only supporting one slot per > controller - so a limitation will stay in place. > > However, the driver (drivers/mmc/host/meson-mx-sdio.c) uses > of_get_compatible_child(), meaning it will also pick the first child > node with the correct compatible string, even if it has status = > "disabled". > I can send a patch to reduce the scope of this limitation: all slots > can be defined but only the first enabled one is used. > What do you think? For the conversion it can stay as is. Follow-up patches allowing multiple slots, adding them in DTC etc. are nice, but not necessary here. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt deleted file mode 100644 index 8765c605e6bc..000000000000 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt +++ /dev/null @@ -1,54 +0,0 @@ -* Amlogic Meson6, Meson8 and Meson8b SDIO/MMC controller - -The highspeed MMC host controller on Amlogic SoCs provides an interface -for MMC, SD, SDIO and SDHC types of memory cards. - -Supported maximum speeds are the ones of the eMMC standard 4.41 as well -as the speed of SD standard 2.0. - -The hardware provides an internal "mux" which allows up to three slots -to be controlled. Only one slot can be accessed at a time. - -Required properties: - - compatible : must be one of - - "amlogic,meson8-sdio" - - "amlogic,meson8b-sdio" - along with the generic "amlogic,meson-mx-sdio" - - reg : mmc controller base registers - - interrupts : mmc controller interrupt - - #address-cells : must be 1 - - size-cells : must be 0 - - clocks : phandle to clock providers - - clock-names : must contain "core" and "clkin" - -Required child nodes: -A node for each slot provided by the MMC controller is required. -NOTE: due to a driver limitation currently only one slot (= child node) - is supported! - -Required properties on each child node (= slot): - - compatible : must be "mmc-slot" (see mmc.txt within this directory) - - reg : the slot (or "port") ID - -Optional properties on each child node (= slot): - - bus-width : must be 1 or 4 (8-bit bus is not supported) - - for cd and all other additional generic mmc parameters - please refer to mmc.txt within this directory - -Examples: - mmc@c1108c20 { - compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio"; - reg = <0xc1108c20 0x20>; - interrupts = <0 28 1>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>; - clock-names = "core", "clkin"; - - slot@1 { - compatible = "mmc-slot"; - reg = <1>; - - bus-width = <4>; - }; - }; diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml new file mode 100644 index 000000000000..3b665396169d --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/amlogic,meson-mx-sdio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson6, Meson8 and Meson8b SDIO/MMC controller + +description: | + The highspeed MMC host controller on Amlogic SoCs provides an interface + for MMC, SD, SDIO and SDHC types of memory cards. + + Supported maximum speeds are the ones of the eMMC standard 4.41 as well + as the speed of SD standard 2.0. + + The hardware provides an internal "mux" which allows up to three slots + to be controlled. Only one slot can be accessed at a time. + +maintainers: + - Neil Armstrong <neil.armstrong@linaro.org> + +properties: + compatible: + items: + - enum: + - amlogic,meson8-sdio + - amlogic,meson8b-sdio + - const: amlogic,meson-mx-sdio + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 2 + + clock-names: + items: + - const: core + - const: clkin + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +patternProperties: + "slot@[0-2]+$": + $ref: mmc-slot.yaml# + description: + A node for each slot provided by the MMC controller + + properties: + reg: + description: + the slot (or "port") ID + enum: [0, 1, 2] + + bus-width: + enum: [1, 4] + + unevaluatedProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - "#address-cells" + - "#size-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + mmc@c1108c20 { + compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio"; + reg = <0xc1108c20 0x20>; + interrupts = <GIC_SPI 28 IRQ_TYPE_EDGE_RISING>; + clocks = <&clk_core>, <&clk_in>; + clock-names = "core", "clkin"; + #address-cells = <1>; + #size-cells = <0>; + + slot@1 { + compatible = "mmc-slot"; + reg = <1>; + bus-width = <4>; + }; + };
Convert the Amlogic Meson6, Meson8 and Meson8b SDIO/MMC controller bindings to dt-schema. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- .../bindings/mmc/amlogic,meson-mx-sdio.txt | 54 ------------ .../bindings/mmc/amlogic,meson-mx-sdio.yaml | 96 ++++++++++++++++++++++ 2 files changed, 96 insertions(+), 54 deletions(-)