| Message ID | 20221204094717.74016-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 07f8f060edd759f6f1bbaea3c078fe526f4dcbf9 |
| Headers | show |
| Series | [1/5] dt-bindings: mmc: sdhci: document sdhci-caps and sdhci-caps-mask | expand |
On Sun, 04 Dec 2022 10:47:14 +0100, Krzysztof Kozlowski wrote: > Cleanup coding style without functional changes: > 1. Drop unnecessary quotes from $ref. > 2. Use simple enum for compatible enumeration and sort entries. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../devicetree/bindings/mmc/sdhci-am654.yaml | 61 ++++++++++--------- > 1 file changed, 31 insertions(+), 30 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
On Sun, Dec 04, 2022 at 10:47:16AM +0100, Krzysztof Kozlowski wrote: > There is no need to explicitly list properties already brought by > mmc-controller.yaml schema. > > Fixes: 8574adf5222d ("dt-bindings: mmc: sdhci-msm: Fix issues in yaml bindings") Redundant, but not broken. With 'Fixes' dropped, Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml index 382d5face49a..c4c73ee1422c 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml @@ -11,7 +11,7 @@ maintainers: - Ulf Hansson <ulf.hansson@linaro.org> allOf: - - $ref: mmc-controller.yaml# + - $ref: sdhci-common.yaml# properties: compatible: @@ -49,8 +49,6 @@ properties: - const: clk_ahb - const: clk_xin - sdhci-caps-mask: true - dma-coherent: type: boolean diff --git a/Documentation/devicetree/bindings/mmc/sdhci-common.yaml b/Documentation/devicetree/bindings/mmc/sdhci-common.yaml new file mode 100644 index 000000000000..1664615187c8 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/sdhci-common.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/sdhci-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SDHCI Controller Common Properties + +maintainers: + - Adrian Hunter <adrian.hunter@intel.com> + +description: + Common properties present on Secure Digital Host Controller Interface (SDHCI) + devices. + +properties: + sdhci-caps: + $ref: /schemas/types.yaml#/definitions/uint64 + description: + Additionally present SDHCI capabilities - values for SDHCI_CAPABILITIES + and SDHCI_CAPABILITIES_1 registers. + + sdhci-caps-mask: + $ref: /schemas/types.yaml#/definitions/uint64 + description: + Masked SDHCI capabilities to remove from SDHCI_CAPABILITIES and + SDHCI_CAPABILITIES_1 registers. + +allOf: + - $ref: mmc-controller.yaml# + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml index fade797af150..2736c9a79f65 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -169,7 +169,7 @@ required: - interrupts allOf: - - $ref: mmc-controller.yaml# + - $ref: sdhci-common.yaml# - if: properties: diff --git a/MAINTAINERS b/MAINTAINERS index 3583c5f6889d..be71999cea73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18732,6 +18732,7 @@ SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER M: Adrian Hunter <adrian.hunter@intel.com> L: linux-mmc@vger.kernel.org S: Supported +F: Documentation/devicetree/bindings/mmc/sdhci-common.yaml F: drivers/mmc/host/sdhci* SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
The Linux SDHCI driver core reads 'sdhci-caps' and 'sdhci-caps-mask' properties and few devices already use it (e.g. Qualcomm SM8450), so add them to a shared SDHCI bindings. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../devicetree/bindings/mmc/sdhci-am654.yaml | 4 +-- .../devicetree/bindings/mmc/sdhci-common.yaml | 32 +++++++++++++++++++ .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 +- MAINTAINERS | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-common.yaml