dt-bindings: mmc: combine common mmc and dw-mshc properties
Subsystems (3)
RFC PATCH 1/3 dt-bindings: mmc: combine common mmc and dw-mshc properties
Combine the common properties for mmc and dw-mshc in mmc-controller-common.yaml
--- .../bindings/mmc/mmc-controller-common.yaml | 342 +++++++++++++++++++++ .../devicetree/bindings/mmc/mmc-controller.yaml | 335 +------------------- 2 files changed, 346 insertions(+), 331 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml
Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml new file +342 -0
@@ -0,0 +1,342 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/mmc-controller-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MMC Controller Common Properties + +maintainers: + - Ulf Hansson <[email protected]> + +properties: + "#address-cells": + const: 1 + description: | + The cell is the slot ID if a function subnode is used. + + "#size-cells": + const: 0 + + # Card Detection. + # If none of these properties are supplied, the host native card + # detect will be used. Only one of them should be provided. + + broken-cd: + $ref: /schemas/types.yaml#/definitions/flag + description: + There is no card detection available; polling must be used. + + cd-gpios: + description: + The card detection will be done using the GPIO provided. + + non-removable: + $ref: /schemas/types.yaml#/definitions/flag + description: + Non-removable slot (like eMMC); assume always present. + + # *NOTE* on CD and WP polarity. To use common for all SD/MMC host + # controllers line polarity properties, we have to fix the meaning + # of the "normal" and "inverted" line levels. We choose to follow + # the SDHCI standard, which specifies both those lines as "active + # low." Therefore, using the "cd-inverted" property means, that the + # CD line is active high, i.e. it is high, when a card is + # inserted. Similar logic applies to the "wp-inverted" property. + # + # CD and WP lines can be implemented on the hardware in one of two + # ways: as GPIOs, specified in cd-gpios and wp-gpios properties, or + # as dedicated pins. Polarity of dedicated pins can be specified, + # using *-inverted properties. GPIO polarity can also be specified + # using the GPIO_ACTIVE_LOW flag. This creates an ambiguity in the + # latter case. We choose to use the XOR logic for GPIO CD and WP + # lines. This means, the two properties are "superimposed," for + # example leaving the GPIO_ACTIVE_LOW flag clear and specifying the + # respective *-inverted property property results in a + # double-inversion and actually means the "normal" line polarity is + # in effect. + wp-inverted: + $ref: /schemas/types.yaml#/definitions/flag + description: + The Write Protect line polarity is inverted. + + cd-inverted: + $ref: /schemas/types.yaml#/definitions/flag + description: + The CD line polarity is inverted. + + # Other properties + + bus-width: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - enum: [1, 4, 8] + default: 1 + description: + Number of data lines. + + max-frequency: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 400000 + - maximum: 200000000 + description: + Maximum operating frequency of the bus. + + disable-wp: + $ref: /schemas/types.yaml#/definitions/flag + description: + When set, no physical write-protect line is present. This + property should only be specified when the controller has a + dedicated write-protect detection logic. If a GPIO is always used + for the write-protect detection logic, it is sufficient to not + specify the wp-gpios property in the absence of a write-protect + line. Not used in combination with eMMC or SDIO. + + wp-gpios: + description: + GPIO to use for the write-protect detection. + + cd-debounce-delay-ms: + description: + Set delay time before detecting card after card insert + interrupt. + + no-1-8-v: + $ref: /schemas/types.yaml#/definitions/flag + description: + When specified, denotes that 1.8V card voltage is not supported + on this system, even if the controller claims it. + + cap-sd-highspeed: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD high-speed timing is supported. + + cap-mmc-highspeed: + $ref: /schemas/types.yaml#/definitions/flag + description: + MMC high-speed timing is supported. + + sd-uhs-sdr12: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD UHS SDR12 speed is supported. + + sd-uhs-sdr25: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD UHS SDR25 speed is supported. + + sd-uhs-sdr50: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD UHS SDR50 speed is supported. + + sd-uhs-sdr104: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD UHS SDR104 speed is supported. + + sd-uhs-ddr50: + $ref: /schemas/types.yaml#/definitions/flag + description: + SD UHS DDR50 speed is supported. + + cap-power-off-card: + $ref: /schemas/types.yaml#/definitions/flag + description: + Powering off the card is safe. + + cap-mmc-hw-reset: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC hardware reset is supported + + cap-sdio-irq: + $ref: /schemas/types.yaml#/definitions/flag + description: + enable SDIO IRQ signalling on this interface + + full-pwr-cycle: + $ref: /schemas/types.yaml#/definitions/flag + description: + Full power cycle of the card is supported. + + mmc-ddr-1_2v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC high-speed DDR mode (1.2V I/O) is supported. + + mmc-ddr-1_8v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC high-speed DDR mode (1.8V I/O) is supported. + + mmc-ddr-3_3v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC high-speed DDR mode (3.3V I/O) is supported. + + mmc-hs200-1_2v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC HS200 mode (1.2V I/O) is supported. + + mmc-hs200-1_8v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC HS200 mode (1.8V I/O) is supported. + + mmc-hs400-1_2v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC HS400 mode (1.2V I/O) is supported. + + mmc-hs400-1_8v: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC HS400 mode (1.8V I/O) is supported. + + mmc-hs400-enhanced-strobe: + $ref: /schemas/types.yaml#/definitions/flag + description: + eMMC HS400 enhanced strobe mode is supported + + dsr: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 0 + - maximum: 0xffff + description: + Value the card Driver Stage Register (DSR) should be programmed + with. + + no-sdio: + $ref: /schemas/types.yaml#/definitions/flag + description: + Controller is limited to send SDIO commands during + initialization. + + no-sd: + $ref: /schemas/types.yaml#/definitions/flag + description: + Controller is limited to send SD commands during initialization. + + no-mmc: + $ref: /schemas/types.yaml#/definitions/flag + description: + Controller is limited to send MMC commands during + initialization. + + fixed-emmc-driver-type: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 0 + - maximum: 4 + description: + For non-removable eMMC, enforce this driver type. The value is + the driver type as specified in the eMMC specification (table + 206 in spec version 5.1) + + post-power-on-delay-ms: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - default: 10 + description: + It was invented for MMC pwrseq-simple which could be referred to + mmc-pwrseq-simple.txt. But now it\'s reused as a tunable delay + waiting for I/O signalling and card power supply to be stable, + regardless of whether pwrseq-simple is used. Default to 10ms if + no available. + + supports-cqe: + $ref: /schemas/types.yaml#/definitions/flag + description: + The presence of this property indicates that the corresponding + MMC host controller supports HW command queue feature. + + disable-cqe-dcmd: + $ref: /schemas/types.yaml#/definitions/flag + description: + The presence of this property indicates that the MMC + controller\'s command queue engine (CQE) does not support direct + commands (DCMDs). + + keep-power-in-suspend: + $ref: /schemas/types.yaml#/definitions/flag + description: + SDIO only. Preserves card power during a suspend/resume cycle. + + # Deprecated: enable-sdio-wakeup + wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + description: + SDIO only. Enables wake up of host system on SDIO IRQ assertion. + + vmmc-supply: + description: + Supply for the card power + + vqmmc-supply: + description: + Supply for the bus IO line power + + mmc-pwrseq: + $ref: /schemas/types.yaml#/definitions/phandle + description: + System-on-Chip designs may specify a specific MMC power + sequence. To successfully detect an (e)MMC/SD/SDIO card, that + power sequence must be maintained while initializing the card. + +patternProperties: + "^.*@[0-9]+$": + type: object + description: | + On embedded systems the cards connected to a host may need + additional properties. These can be specified in subnodes to the + host controller node. The subnodes are identified by the + standard \'reg\' property. Which information exactly can be + specified depends on the bindings for the SDIO function driver + for the subnode, as specified by the compatible string. + + properties: + compatible: + description: | + Name of SDIO function following generic names recommended + practice + + reg: + items: + - minimum: 0 + maximum: 7 + description: + Must contain the SDIO function number of the function this + subnode describes. A value of 0 denotes the memory SD + function, values from 1 to 7 denote the SDIO functions. + + broken-hpi: + $ref: /schemas/types.yaml#/definitions/flag + description: + Use this to indicate that the mmc-card has a broken hpi + implementation, and that hpi should not be used. + + required: + - reg + + "^clk-phase-(legacy|sd-hs|mmc-(hs|hs[24]00|ddr52)|uhs-(sdr(12|25|50|104)|ddr50))$": + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 2 + maxItems: 2 + items: + minimum: 0 + maximum: 359 + description: + Set the clock (phase) delays which are to be configured in the + controller while switching to particular speed mode. These values + are in pair of degrees. + +dependencies: + cd-debounce-delay-ms: [ cd-gpios ] + fixed-emmc-driver-type: [ non-removable ]
Documentation/devicetree/bindings/mmc/mmc-controller.yaml +4 -331
345 lines not on this page · raw message
Signature · 1 line
2.11.0
RFC PATCH 2/3 dt-bindings: mmc: convert synopsys dw-mshc bindings to yaml
Convert the Synopsys designware mobile storage host controller device tree bindings to yaml
--- .../bindings/mmc/synopsys-dw-mshc-common.yaml | 81 ++++++++++++ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 141 --------------------- .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 88 +++++++++++++ 3 files changed, 169 insertions(+), 141 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml delete mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt create mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +81 -0
@@ -0,0 +1,81 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/synopsys-dw-mshc-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys Designware Mobile Storage Host Controller Common Properties + +allOf: + - $ref: "mmc-controller-common.yaml" + +maintainers: + - Ulf Hansson <[email protected]> + +properties: + resets: + maxItems: 1 + description: + phandle + reset specifier pair, intended to represent hardware + reset signal present internally in some host controller IC designs. + See Documentation/devicetree/bindings/reset/reset.txt for details. + + reset-names: + const: reset + description: + Request name for using "resets" property. + (It will be used together with "resets" property.) + + clock-frequency: + description: + Should be the frequency (in Hz) of the ciu clock. If this + is specified and the ciu clock is specified then we'll try to set the ciu + clock to this at probe time. + + fifo-depth: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + The maximum size of the tx/rx fifo's. If this property is not + specified, the default value of the fifo size is determined from the + controller registers. + + card-detect-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - default: 0 + description: + Delay in milli-seconds before detecting card after card + insert event. The default value is 0. + + data-addr: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Override fifo address with value provided by DT. The default FIFO reg + offset is assumed as 0x100 (version < 0x240A) and 0x200(version >= 0x240A) + by driver. If the controller does not follow this rule, please use + this property to set fifo address in device tree. + + fifo-watermark-aligned: + allOf: + - $ref: /schemas/types.yaml#/definitions/flag + description: + Data done irq is expected if data length is less than + watermark in PIO mode. But fifo watermark is requested to be aligned + with data length in some SoC so that TX/RX irq can be generated with + data done irq. Add this watermark quirk to mark this requirement and + force fifo watermark setting accordingly. + + dmas: + maxItems: 1 + description: + List of DMA specifiers with the controller specific format as described + in the generic DMA client binding. + Refer to dma-controller.yaml for details. + + dma-names: + const: rx-tx + description: + Request names for generic DMA client binding. + Refer to dma-controller.yaml for details.
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt deleted +0 -141
141 lines not on this page · raw message
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [RFC PATCH v1 2/3] dt-bindings: mmc: convert synopsys dw-mshc bindings to yaml
Quoted 31 lines · Johan Jonker
Convert the Synopsys designware mobile storage host controller device tree bindings to yaml
Signed-off-by Johan Jonker <[email protected]>--- .../bindings/mmc/synopsys-dw-mshc-common.yaml | 81 ++++++++++++ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 141 --------------------- .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 88 +++++++++++++ 3 files changed, 169 insertions(+), 141 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml delete mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt create mode 100644 Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yamlDocumentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +11
-0@@ -0,0 +1,81 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/synopsys-dw-mshc-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys Designware Mobile Storage Host Controller Common Properties + +allOf: + - $ref: "mmc-controller-common.yaml" +
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +10
-0+maintainers: + - Ulf Hansson <[email protected]> + +properties: + resets: + maxItems: 1 + description: + phandle + reset specifier pair, intended to represent hardware + reset signal present internally in some host controller IC designs. + See Documentation/devicetree/bindings/reset/reset.txt for details.
Drop the description. It has nothing unique to this binding.
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml line 27
Quoted 6 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +6
-0+ + reset-names: + const: reset + description: + Request name for using "resets" property. + (It will be used together with "resets" property.)
Drop.
Quoted 38 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +38
-0+ + clock-frequency: + description: + Should be the frequency (in Hz) of the ciu clock. If this + is specified and the ciu clock is specified then we'll try to set the ciu + clock to this at probe time. + + fifo-depth: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + The maximum size of the tx/rx fifo's. If this property is not + specified, the default value of the fifo size is determined from the + controller registers. + + card-detect-delay: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - default: 0 + description: + Delay in milli-seconds before detecting card after card + insert event. The default value is 0. + + data-addr: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Override fifo address with value provided by DT. The default FIFO reg + offset is assumed as 0x100 (version < 0x240A) and 0x200(version >= 0x240A) + by driver. If the controller does not follow this rule, please use + this property to set fifo address in device tree. + + fifo-watermark-aligned: + allOf: + - $ref: /schemas/types.yaml#/definitions/flag + description: + Data done irq is expected if data length is less than + watermark in PIO mode. But fifo watermark is requested to be aligned
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml line 75
Quoted 10 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +10
-0+ with data length in some SoC so that TX/RX irq can be generated with + data done irq. Add this watermark quirk to mark this requirement and + force fifo watermark setting accordingly. + + dmas: + maxItems: 1 + description: + List of DMA specifiers with the controller specific format as described + in the generic DMA client binding. + Refer to dma-controller.yaml for details.
Drop the description.
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml line 81
Quoted 6 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml new file +6
-0+ + dma-names: + const: rx-tx + description: + Request names for generic DMA client binding. + Refer to dma-controller.yaml for details.
Drop
[...]
Quoted 42 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +36
-0@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/synopsys-dw-mshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys Designware Mobile Storage Host Controller Binding + +allOf: + - $ref: "synopsys-dw-mshc-common.yaml" + +maintainers: + - Ulf Hansson <[email protected]> + +properties: + compatible: + const: snps,dw-mshc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 2 + maxItems: 2 + description: + Handle to "biu" and "ciu" clocks for the + bus interface unit clock and the card interface unit clock. + + clock-names: + items: + - const: biu + - const: ciu +
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +10
-0+required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +examples: + # The MSHC controller node can be split into two portions, SoC specific and + # board specific portions as listed below.
This split doesn't work because the examples are built and validated now. It may happen to because all the props are optional, but the board hunk goes unchecked. So please combine.
Quoted 45 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +42
-1+ - | + dwmmc0@12200000 { + compatible = "snps,dw-mshc"; + clocks = <&clock 351>, <&clock 132>; + clock-names = "biu", "ciu"; + reg = <0x12200000 0x1000>; + interrupts = <0 75 0>; + #address-cells = <1>; + #size-cells = <0>; + data-addr = <0x200>; + fifo-watermark-aligned; + resets = <&rst 20>; + reset-names = "reset"; + }; + # [board specific internal DMA resources] + - | + dwmmc0@12200000 { + clock-frequency = <400000000>; + clock-freq-min-max = <400000 200000000>; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + vmmc-supply = <&buck8>; + bus-width = <8>; + cap-mmc-highspeed; + cap-sd-highspeed; + }; + # [board specific generic DMA request binding] + - | + dwmmc0@12200000 { + clock-frequency = <400000000>; + clock-freq-min-max = <400000 200000000>; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + vmmc-supply = <&buck8>; + bus-width = <8>; + cap-mmc-highspeed; + cap-sd-highspeed; + dmas = <&pdma 12>; + dma-names = "rx-tx"; + }; --2.11.0
Re: [RFC PATCH v1 2/3] dt-bindings: mmc: convert synopsys dw-mshc bindings to yaml
See below.
Quoted 18 lines · Rob Herring
Quoted 1 line · Johan Jonker
[...]
Quoted 13 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +7
-0@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/synopsys-dw-mshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys Designware Mobile Storage Host Controller Binding
[..]
Quoted 10 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml line 46
Quoted 3 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +3
-0+examples: + # The MSHC controller node can be split into two portions, SoC specific and + # board specific portions as listed below.This split doesn't work because the examples are built and validated now. It may happen to because all the props are optional, but the board hunk goes unchecked. So please combine.
Hi,
I have no knowledge about this particular hardware to give a realistic example. Could someone advise here? Or should I just use the first example for now?
Thanks
Quoted 45 lines
Quoted 45 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +42
-1+ - | + dwmmc0@12200000 { + compatible = "snps,dw-mshc"; + clocks = <&clock 351>, <&clock 132>; + clock-names = "biu", "ciu"; + reg = <0x12200000 0x1000>; + interrupts = <0 75 0>; + #address-cells = <1>; + #size-cells = <0>; + data-addr = <0x200>; + fifo-watermark-aligned; + resets = <&rst 20>; + reset-names = "reset"; + }; + # [board specific internal DMA resources] + - | + dwmmc0@12200000 { + clock-frequency = <400000000>; + clock-freq-min-max = <400000 200000000>; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + vmmc-supply = <&buck8>; + bus-width = <8>; + cap-mmc-highspeed; + cap-sd-highspeed; + }; + # [board specific generic DMA request binding] + - | + dwmmc0@12200000 { + clock-frequency = <400000000>; + clock-freq-min-max = <400000 200000000>; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + vmmc-supply = <&buck8>; + bus-width = <8>; + cap-mmc-highspeed; + cap-sd-highspeed; + dmas = <&pdma 12>; + dma-names = "rx-tx"; + }; --2.11.0
Re: [RFC PATCH v1 2/3] dt-bindings: mmc: convert synopsys dw-mshc bindings to yaml
Quoted 36 lines · Johan Jonker
See below.
Quoted 18 lines · Rob Herring
Quoted 1 line · Johan Jonker
[...]
Quoted 13 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +7
-0@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/synopsys-dw-mshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys Designware Mobile Storage Host Controller Binding[..]
Quoted 10 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml line 46
Quoted 3 lines
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml new file +3
-0+examples: + # The MSHC controller node can be split into two portions, SoC specific and + # board specific portions as listed below.This split doesn't work because the examples are built and validated now. It may happen to because all the props are optional, but the board hunk goes unchecked. So please combine.
Quoted 5 lines
Hi,
I have no knowledge about this particular hardware to give a realistic example. Could someone advise here? Or should I just use the first example for now?
Just combine the first part and one of the the 2 board hunks. I don't think having 2 board examples with the only diff being the dma properties adds much value.
Rob
RFC PATCH 3/3 dt-bindings: mmc: convert rockchip dw-mshc bindings to yaml
In reply to Johan JonkerConvert the Rockchip designware mobile storage host controller device tree bindings to yaml.
Add maintainer.
--- .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 49 -------- .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 137 +++++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 138 insertions(+), 49 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt create mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt deleted +0 -49
@@ -1,49 +0,0 @@ -* Rockchip specific extensions to the Synopsys Designware Mobile - Storage Host Controller - -The Synopsys designware mobile storage host controller is used to interface -a SoC with storage medium such as eMMC or SD/MMC cards. This file documents -differences between the core Synopsys dw mshc controller properties described -by synopsys-dw-mshc.txt and the properties used by the Rockchip specific -extensions to the Synopsys Designware Mobile Storage Host Controller. - -Required Properties: - -* compatible: should be - - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following, - before RK3288 - - "rockchip,rk3288-dw-mshc": for Rockchip RK3288 - - "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108 - - "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip PX30 - - "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036 - - "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK322x - - "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3328 - - "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368 - - "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399 - -Optional Properties: -* clocks: from common clock binding: if ciu-drive and ciu-sample are - specified in clock-names, should contain handles to these clocks. - -* clock-names: Apart from the clock-names described in synopsys-dw-mshc.txt - two more clocks "ciu-drive" and "ciu-sample" are supported. They are used - to control the clock phases, "ciu-sample" is required for tuning high- - speed modes. - -* rockchip,default-sample-phase: The default phase to set ciu-sample at - probing, low speeds or in case where all phases work at tuning time. - If not specified 0 deg will be used. - -* rockchip,desired-num-phases: The desired number of times that the host - execute tuning when needed. If not specified, the host will do tuning - for 360 times, namely tuning for each degree. - -Example: - - rkdwmmc0@12200000 { - compatible = "rockchip,rk3288-dw-mshc"; - reg = <0x12200000 0x1000>; - interrupts = <0 75 0>; - #address-cells = <1>; - #size-cells = <0>; - };
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +137 -0
137 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -2240,6 +2240,7 @@ L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-rk3x.txt +F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: arch/arm/boot/dts/rk3* F: arch/arm/boot/dts/rv1108* F: arch/arm/mach-rockchip/
Signature · 1 line
2.11.0
Re: [RFC PATCH v1 3/3] dt-bindings: mmc: convert rockchip dw-mshc bindings to yaml
Quoted 77 lines · Johan Jonker
Convert the Rockchip designware mobile storage host controller device tree bindings to yaml.
Add maintainer.Signed-off-by Johan Jonker <[email protected]>--- .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 49 -------- .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 137 +++++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 138 insertions(+), 49 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt create mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yamlDocumentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt deleted +0
-49@@ -1,49 +0,0 @@ -* Rockchip specific extensions to the Synopsys Designware Mobile - Storage Host Controller - -The Synopsys designware mobile storage host controller is used to interface -a SoC with storage medium such as eMMC or SD/MMC cards. This file documents -differences between the core Synopsys dw mshc controller properties described -by synopsys-dw-mshc.txt and the properties used by the Rockchip specific -extensions to the Synopsys Designware Mobile Storage Host Controller. - -Required Properties: - -* compatible: should be - - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following, - before RK3288 - - "rockchip,rk3288-dw-mshc": for Rockchip RK3288 - - "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108 - - "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip PX30 - - "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036 - - "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK322x - - "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3328 - - "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368 - - "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399 - -Optional Properties: -* clocks: from common clock binding: if ciu-drive and ciu-sample are - specified in clock-names, should contain handles to these clocks. - -* clock-names: Apart from the clock-names described in synopsys-dw-mshc.txt - two more clocks "ciu-drive" and "ciu-sample" are supported. They are used - to control the clock phases, "ciu-sample" is required for tuning high- - speed modes. - -* rockchip,default-sample-phase: The default phase to set ciu-sample at - probing, low speeds or in case where all phases work at tuning time. - If not specified 0 deg will be used. - -* rockchip,desired-num-phases: The desired number of times that the host - execute tuning when needed. If not specified, the host will do tuning - for 360 times, namely tuning for each degree. - -Example: - - rkdwmmc0@12200000 { - compatible = "rockchip,rk3288-dw-mshc"; - reg = <0x12200000 0x1000>; - interrupts = <0 75 0>; - #address-cells = <1>; - #size-cells = <0>; - };Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +2
-0@@ -0,0 +1,137 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml line 12
Quoted 10 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +10
-0+--- +$id: http://devicetree.org/schemas/mmc/rockchip-dw-mshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip designware mobile storage host controller device tree bindings + +description: + Rockchip uses the Synopsys designware mobile storage host controller + to interface a SoC with storage medium such as eMMC or SD/MMC cards. + This file documents the combined properties for
Strange place for a line break...
Quoted 35 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +35
-0+ the core Synopsys dw mshc controller that are not already included + in the synopsys-dw-mshc-common.yaml file and the Rockchip specific + extensions. + +allOf: + - $ref: "synopsys-dw-mshc-common.yaml" + +maintainers: + - Heiko Stuebner <[email protected]> + +properties: + compatible: + oneOf: + # for Rockchip PX30 + - items: + - const: rockchip,px30-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK2928 and before RK3288 + - const: rockchip,rk2928-dw-mshc + # for Rockchip RK3036 + - items: + - const: rockchip,rk3036-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK322x + - items: + - const: rockchip,rk3228-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK3288 + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK3328 + - items: + - const: rockchip,rk3328-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK3368 + - items:
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml line 57
Quoted 10 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +10
-0+ - const: rockchip,rk3368-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RK3399 + - items: + - const: rockchip,rk3399-dw-mshc + - const: rockchip,rk3288-dw-mshc + # for Rockchip RV1108 + - items: + - const: rockchip,rv1108-dw-mshc + - const: rockchip,rk3288-dw-mshc
All the ones with fallback rockchip,rk3288-dw-mshc can be grouped as one items list with 'enum' for the first item.
Quoted 16 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +16
-0+ + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 2 + maxItems: 4 + description: + Handle to "biu" and "ciu" clocks for the bus interface unit clock and + the card interface unit clock. If "ciu-drive" and "ciu-sample" are + specified in clock-names, it should also contain + handles to these clocks. +
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml line 83
Quoted 10 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +10
-0+ clock-names: + oneOf: + - items: + - const: biu + - const: ciu + - items: + - const: biu + - const: ciu + - const: ciu-drive + - const: ciu-sample
Add 'minItems: 2' and you only need 1 list.
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml line 95
Quoted 12 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +12
-0+ description: + Apart from the clock-names "biu" and "ciu" two more clocks + "ciu-drive" and "ciu-sample" are supported. They are used + to control the clock phases, "ciu-sample" is required for tuning + high speed modes. + + rockchip,default-sample-phase: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 0 + - maximum: 360 + - default: 0
Move these 3 to the same level as 'allOf' (dropping '-').
Quoted 29 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +29
-0+ description: + The default phase to set "ciu-sample" at probing, + low speeds or in case where all phases work at tuning time. + If not specified 0 deg will be used. + + rockchip,desired-num-phases: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 0 + - maximum: 360 + - default: 360 + description: + The desired number of times that the host execute tuning when needed. + If not specified, the host will do tuning for 360 times, + namely tuning for each degree. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +examples: + - | + #include <dt-bindings/clock/rk3288-cru.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + sdmmc: dwmmc@ff0c0000 {
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml line 134
Quoted 10 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +10
-0+ compatible = "rockchip,rk3288-dw-mshc"; + reg = <0x0 0xff0c0000 0x0 0x4000>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, + <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + resets = <&cru SRST_MMC0>; + reset-names = "reset"; + fifo-depth = <0x100>; + max-frequency = <150000000>;
Not documented.
Quoted 18 lines
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml new file +3
-0+ }; + +...MAINTAINERS +1
-1@@ -2240,6 +2240,7 @@ L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-rk3x.txt +F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: arch/arm/boot/dts/rk3* F: arch/arm/boot/dts/rv1108* F: arch/arm/mach-rockchip/ --2.11.0
Quoted 3 lines · Johan Jonker
Combine the common properties for mmc and dw-mshc in
mmc-controller-common.yaml
Commit messages should explain the why, not what.
AFAICT, the only reason is to not have a node name of 'mmc'. That's entirely the reason why it is defined. Fix your node names to use the standard name.
Rob
Hi,
Thank you for your explanation.
I was not aware that was playing.
So now we go from a 'simple' txt to yaml conversion to a complete 'change your node name first' operation.
Can you indicate if that common yaml file for dw-mshc and Rockchip is still a good idea?
Thanks
Quoted 15 lines · Rob Herring
Quoted 3 lines · Johan Jonker
Combine the common properties for mmc and dw-mshc in
mmc-controller-common.yamlCommit messages should explain the why, not what.
AFAICT, the only reason is to not have a node name of 'mmc'. That's entirely the reason why it is defined. Fix your node names to use the standard name.
Rob
Quoted 7 lines · Johan Jonker
Hi,
Thank you for your explanation.
I was not aware that was playing.
So now we go from a 'simple' txt to yaml conversion to a complete 'change your node name first' operation.
You only need to update the examples, not all the dts files for now.
Quoted 2 lines
Can you indicate if that common yaml file for dw-mshc and Rockchip is still a good idea?
Yes, that's fine.
Rob