| Message ID | 20211208003727.3596577-2-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Broadcom DT bindings updates to YAML | expand |
- trimmed cc list On Wed, 8 Dec 2021 at 01:37, Florian Fainelli <f.fainelli@gmail.com> wrote: > > Convert the Broadcom STB SDHCI controller Device Tree binding to YAML. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied for next, thanks! Kind regards Uffe > --- > .../bindings/mmc/brcm,sdhci-brcmstb.txt | 53 ---------- > .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 100 ++++++++++++++++++ > 2 files changed, 100 insertions(+), 53 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > > diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > deleted file mode 100644 > index ae2074184528..000000000000 > --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > +++ /dev/null > @@ -1,53 +0,0 @@ > -* BROADCOM BRCMSTB/BMIPS SDHCI Controller > - > -This file documents differences between the core properties in mmc.txt > -and the properties used by the sdhci-brcmstb driver. > - > -NOTE: The driver disables all UHS speed modes by default and depends > -on Device Tree properties to enable them for SoC/Board combinations > -that support them. > - > -Required properties: > -- compatible: should be one of the following > - - "brcm,bcm7425-sdhci" > - - "brcm,bcm7445-sdhci" > - - "brcm,bcm7216-sdhci" > - > -Refer to clocks/clock-bindings.txt for generic clock consumer properties. > - > -Example: > - > - sdhci@84b0000 { > - sd-uhs-sdr50; > - sd-uhs-ddr50; > - sd-uhs-sdr104; > - sdhci,auto-cmd12; > - compatible = "brcm,bcm7216-sdhci", > - "brcm,bcm7445-sdhci", > - "brcm,sdhci-brcmstb"; > - reg = <0x84b0000 0x260 0x84b0300 0x200>; > - reg-names = "host", "cfg"; > - interrupts = <0x0 0x26 0x4>; > - interrupt-names = "sdio0_0"; > - clocks = <&scmi_clk 245>; > - clock-names = "sw_sdio"; > - }; > - > - sdhci@84b1000 { > - mmc-ddr-1_8v; > - mmc-hs200-1_8v; > - mmc-hs400-1_8v; > - mmc-hs400-enhanced-strobe; > - supports-cqe; > - non-removable; > - bus-width = <0x8>; > - compatible = "brcm,bcm7216-sdhci", > - "brcm,bcm7445-sdhci", > - "brcm,sdhci-brcmstb"; > - reg = <0x84b1000 0x260 0x84b1300 0x200>; > - reg-names = "host", "cfg"; > - interrupts = <0x0 0x27 0x4>; > - interrupt-names = "sdio1_0"; > - clocks = <&scmi_clk 245>; > - clock-names = "sw_sdio"; > - }; > diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > new file mode 100644 > index 000000000000..dccd5ad96981 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > @@ -0,0 +1,100 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mmc/brcm,sdhci-brcmstb.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Broadcom BRCMSTB/BMIPS SDHCI Controller binding > + > +maintainers: > + - Al Cooper <alcooperx@gmail.com> > + - Florian Fainelli <f.fainelli@gmail.com> > + > +allOf: > + - $ref: mmc-controller.yaml# > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - brcm,bcm7216-sdhci > + - const: brcm,bcm7445-sdhci > + - const: brcm,sdhci-brcmstb > + - items: > + - enum: > + - brcm,bcm7445-sdhci > + - const: brcm,sdhci-brcmstb > + - items: > + - enum: > + - brcm,bcm7425-sdhci > + - const: brcm,sdhci-brcmstb > + > + reg: > + minItems: 2 > + > + reg-names: > + items: > + - const: host > + - const: cfg > + > + interrupts: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + description: > + handle to core clock for the sdhci controller. > + > + clock-names: > + items: > + - const: sw_sdio > + > + sdhci,auto-cmd12: > + type: boolean > + description: Specifies that controller should use auto CMD12 > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + > +unevaluatedProperties: false > + > +examples: > + - | > + mmc@84b0000 { > + sd-uhs-sdr50; > + sd-uhs-ddr50; > + sd-uhs-sdr104; > + sdhci,auto-cmd12; > + compatible = "brcm,bcm7216-sdhci", > + "brcm,bcm7445-sdhci", > + "brcm,sdhci-brcmstb"; > + reg = <0x84b0000 0x260>, <0x84b0300 0x200>; > + reg-names = "host", "cfg"; > + interrupts = <0x0 0x26 0x4>; > + interrupt-names = "sdio0_0"; > + clocks = <&scmi_clk 245>; > + clock-names = "sw_sdio"; > + }; > + > + mmc@84b1000 { > + mmc-ddr-1_8v; > + mmc-hs200-1_8v; > + mmc-hs400-1_8v; > + mmc-hs400-enhanced-strobe; > + supports-cqe; > + non-removable; > + bus-width = <0x8>; > + compatible = "brcm,bcm7216-sdhci", > + "brcm,bcm7445-sdhci", > + "brcm,sdhci-brcmstb"; > + reg = <0x84b1000 0x260>, <0x84b1300 0x200>; > + reg-names = "host", "cfg"; > + interrupts = <0x0 0x27 0x4>; > + interrupt-names = "sdio1_0"; > + clocks = <&scmi_clk 245>; > + clock-names = "sw_sdio"; > + }; > -- > 2.25.1 >
On Tue, Dec 7, 2021 at 6:37 PM Florian Fainelli <f.fainelli@gmail.com> wrote: > > Convert the Broadcom STB SDHCI controller Device Tree binding to YAML. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > .../bindings/mmc/brcm,sdhci-brcmstb.txt | 53 ---------- > .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 100 ++++++++++++++++++ > 2 files changed, 100 insertions(+), 53 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > > diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > deleted file mode 100644 > index ae2074184528..000000000000 > --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt > +++ /dev/null > @@ -1,53 +0,0 @@ > -* BROADCOM BRCMSTB/BMIPS SDHCI Controller > - > -This file documents differences between the core properties in mmc.txt > -and the properties used by the sdhci-brcmstb driver. > - > -NOTE: The driver disables all UHS speed modes by default and depends > -on Device Tree properties to enable them for SoC/Board combinations > -that support them. > - > -Required properties: > -- compatible: should be one of the following > - - "brcm,bcm7425-sdhci" > - - "brcm,bcm7445-sdhci" > - - "brcm,bcm7216-sdhci" > - > -Refer to clocks/clock-bindings.txt for generic clock consumer properties. > - > -Example: > - > - sdhci@84b0000 { > - sd-uhs-sdr50; > - sd-uhs-ddr50; > - sd-uhs-sdr104; > - sdhci,auto-cmd12; > - compatible = "brcm,bcm7216-sdhci", > - "brcm,bcm7445-sdhci", > - "brcm,sdhci-brcmstb"; > - reg = <0x84b0000 0x260 0x84b0300 0x200>; > - reg-names = "host", "cfg"; > - interrupts = <0x0 0x26 0x4>; > - interrupt-names = "sdio0_0"; > - clocks = <&scmi_clk 245>; > - clock-names = "sw_sdio"; > - }; > - > - sdhci@84b1000 { > - mmc-ddr-1_8v; > - mmc-hs200-1_8v; > - mmc-hs400-1_8v; > - mmc-hs400-enhanced-strobe; > - supports-cqe; > - non-removable; > - bus-width = <0x8>; > - compatible = "brcm,bcm7216-sdhci", > - "brcm,bcm7445-sdhci", > - "brcm,sdhci-brcmstb"; > - reg = <0x84b1000 0x260 0x84b1300 0x200>; > - reg-names = "host", "cfg"; > - interrupts = <0x0 0x27 0x4>; > - interrupt-names = "sdio1_0"; > - clocks = <&scmi_clk 245>; > - clock-names = "sw_sdio"; > - }; > diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > new file mode 100644 > index 000000000000..dccd5ad96981 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml > @@ -0,0 +1,100 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mmc/brcm,sdhci-brcmstb.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Broadcom BRCMSTB/BMIPS SDHCI Controller binding > + > +maintainers: > + - Al Cooper <alcooperx@gmail.com> > + - Florian Fainelli <f.fainelli@gmail.com> > + > +allOf: > + - $ref: mmc-controller.yaml# > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - brcm,bcm7216-sdhci > + - const: brcm,bcm7445-sdhci > + - const: brcm,sdhci-brcmstb > + - items: > + - enum: > + - brcm,bcm7445-sdhci > + - const: brcm,sdhci-brcmstb > + - items: > + - enum: > + - brcm,bcm7425-sdhci > + - const: brcm,sdhci-brcmstb > + > + reg: > + minItems: 2 > + > + reg-names: > + items: > + - const: host > + - const: cfg > + > + interrupts: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + description: > + handle to core clock for the sdhci controller. > + > + clock-names: > + items: > + - const: sw_sdio > + > + sdhci,auto-cmd12: > + type: boolean > + description: Specifies that controller should use auto CMD12 > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + > +unevaluatedProperties: false > + > +examples: > + - | > + mmc@84b0000 { > + sd-uhs-sdr50; > + sd-uhs-ddr50; > + sd-uhs-sdr104; > + sdhci,auto-cmd12; > + compatible = "brcm,bcm7216-sdhci", > + "brcm,bcm7445-sdhci", > + "brcm,sdhci-brcmstb"; > + reg = <0x84b0000 0x260>, <0x84b0300 0x200>; > + reg-names = "host", "cfg"; > + interrupts = <0x0 0x26 0x4>; > + interrupt-names = "sdio0_0"; Not documented. Rob
diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt deleted file mode 100644 index ae2074184528..000000000000 --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt +++ /dev/null @@ -1,53 +0,0 @@ -* BROADCOM BRCMSTB/BMIPS SDHCI Controller - -This file documents differences between the core properties in mmc.txt -and the properties used by the sdhci-brcmstb driver. - -NOTE: The driver disables all UHS speed modes by default and depends -on Device Tree properties to enable them for SoC/Board combinations -that support them. - -Required properties: -- compatible: should be one of the following - - "brcm,bcm7425-sdhci" - - "brcm,bcm7445-sdhci" - - "brcm,bcm7216-sdhci" - -Refer to clocks/clock-bindings.txt for generic clock consumer properties. - -Example: - - sdhci@84b0000 { - sd-uhs-sdr50; - sd-uhs-ddr50; - sd-uhs-sdr104; - sdhci,auto-cmd12; - compatible = "brcm,bcm7216-sdhci", - "brcm,bcm7445-sdhci", - "brcm,sdhci-brcmstb"; - reg = <0x84b0000 0x260 0x84b0300 0x200>; - reg-names = "host", "cfg"; - interrupts = <0x0 0x26 0x4>; - interrupt-names = "sdio0_0"; - clocks = <&scmi_clk 245>; - clock-names = "sw_sdio"; - }; - - sdhci@84b1000 { - mmc-ddr-1_8v; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - supports-cqe; - non-removable; - bus-width = <0x8>; - compatible = "brcm,bcm7216-sdhci", - "brcm,bcm7445-sdhci", - "brcm,sdhci-brcmstb"; - reg = <0x84b1000 0x260 0x84b1300 0x200>; - reg-names = "host", "cfg"; - interrupts = <0x0 0x27 0x4>; - interrupt-names = "sdio1_0"; - clocks = <&scmi_clk 245>; - clock-names = "sw_sdio"; - }; diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml new file mode 100644 index 000000000000..dccd5ad96981 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml @@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/brcm,sdhci-brcmstb.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BRCMSTB/BMIPS SDHCI Controller binding + +maintainers: + - Al Cooper <alcooperx@gmail.com> + - Florian Fainelli <f.fainelli@gmail.com> + +allOf: + - $ref: mmc-controller.yaml# + +properties: + compatible: + oneOf: + - items: + - enum: + - brcm,bcm7216-sdhci + - const: brcm,bcm7445-sdhci + - const: brcm,sdhci-brcmstb + - items: + - enum: + - brcm,bcm7445-sdhci + - const: brcm,sdhci-brcmstb + - items: + - enum: + - brcm,bcm7425-sdhci + - const: brcm,sdhci-brcmstb + + reg: + minItems: 2 + + reg-names: + items: + - const: host + - const: cfg + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + description: + handle to core clock for the sdhci controller. + + clock-names: + items: + - const: sw_sdio + + sdhci,auto-cmd12: + type: boolean + description: Specifies that controller should use auto CMD12 + +required: + - compatible + - reg + - interrupts + - clocks + +unevaluatedProperties: false + +examples: + - | + mmc@84b0000 { + sd-uhs-sdr50; + sd-uhs-ddr50; + sd-uhs-sdr104; + sdhci,auto-cmd12; + compatible = "brcm,bcm7216-sdhci", + "brcm,bcm7445-sdhci", + "brcm,sdhci-brcmstb"; + reg = <0x84b0000 0x260>, <0x84b0300 0x200>; + reg-names = "host", "cfg"; + interrupts = <0x0 0x26 0x4>; + interrupt-names = "sdio0_0"; + clocks = <&scmi_clk 245>; + clock-names = "sw_sdio"; + }; + + mmc@84b1000 { + mmc-ddr-1_8v; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + supports-cqe; + non-removable; + bus-width = <0x8>; + compatible = "brcm,bcm7216-sdhci", + "brcm,bcm7445-sdhci", + "brcm,sdhci-brcmstb"; + reg = <0x84b1000 0x260>, <0x84b1300 0x200>; + reg-names = "host", "cfg"; + interrupts = <0x0 0x27 0x4>; + interrupt-names = "sdio1_0"; + clocks = <&scmi_clk 245>; + clock-names = "sw_sdio"; + };
Convert the Broadcom STB SDHCI controller Device Tree binding to YAML. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- .../bindings/mmc/brcm,sdhci-brcmstb.txt | 53 ---------- .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 100 ++++++++++++++++++ 2 files changed, 100 insertions(+), 53 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml