lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0793/1157] dt-bindings: mmc: sdhci-msm: Fix issues in yaml bindings
    Date
    From: Bhupesh Sharma <bhupesh.sharma@linaro.org>

    [ Upstream commit 8574adf5222d786b747022c6edcbcdddf409a139 ]

    Rob pointed some remaining issues in the sdhci-msm yaml
    bindings (via [1]).

    Fix the same by first using the 'mmc-controller.yaml' as
    'ref' and thereafter also fix the issues reported by
    'make dtbs_check' check.

    [1]. https://lore.kernel.org/linux-arm-msm/YnLmNCwNfoqZln12@robh.at.kernel.org/

    Fixes: a45537723f4b ("dt-bindings: mmc: sdhci-msm: Convert bindings to yaml")
    Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
    Cc: Rob Herring <robh@kernel.org>
    Cc: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
    Link: https://lore.kernel.org/r/20220514220116.1008254-1-bhupesh.sharma@linaro.org
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../devicetree/bindings/mmc/sdhci-msm.yaml | 52 ++++++++++++++++---
    1 file changed, 44 insertions(+), 8 deletions(-)

    diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
    index e4236334e748..31a3ce208e1a 100644
    --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
    +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
    @@ -17,6 +17,9 @@ description:
    properties:
    compatible:
    oneOf:
    + - enum:
    + - qcom,sdhci-msm-v4
    + deprecated: true
    - items:
    - enum:
    - qcom,apq8084-sdhci
    @@ -27,6 +30,9 @@ properties:
    - qcom,msm8992-sdhci
    - qcom,msm8994-sdhci
    - qcom,msm8996-sdhci
    + - const: qcom,sdhci-msm-v4 # for sdcc versions less than 5.0
    + - items:
    + - enum:
    - qcom,qcs404-sdhci
    - qcom,sc7180-sdhci
    - qcom,sc7280-sdhci
    @@ -38,12 +44,7 @@ properties:
    - qcom,sm6350-sdhci
    - qcom,sm8150-sdhci
    - qcom,sm8250-sdhci
    - - enum:
    - - qcom,sdhci-msm-v4 # for sdcc versions less than 5.0
    - - qcom,sdhci-msm-v5 # for sdcc version 5.0
    - - items:
    - - const: qcom,sdhci-msm-v4 # Deprecated (only for backward compatibility)
    - # for sdcc versions less than 5.0
    + - const: qcom,sdhci-msm-v5 # for sdcc version 5.0

    reg:
    minItems: 1
    @@ -53,6 +54,28 @@ properties:
    - description: CQE register map
    - description: Inline Crypto Engine register map

    + reg-names:
    + minItems: 1
    + maxItems: 4
    + oneOf:
    + - items:
    + - const: hc_mem
    + - items:
    + - const: hc_mem
    + - const: core_mem
    + - items:
    + - const: hc_mem
    + - const: cqe_mem
    + - items:
    + - const: hc_mem
    + - const: cqe_mem
    + - const: ice_mem
    + - items:
    + - const: hc_mem
    + - const: core_mem
    + - const: cqe_mem
    + - const: ice_mem
    +
    clocks:
    minItems: 3
    items:
    @@ -121,6 +144,16 @@ properties:
    description: A phandle to sdhci power domain node
    maxItems: 1

    + mmc-ddr-1_8v: true
    +
    + mmc-hs200-1_8v: true
    +
    + mmc-hs400-1_8v: true
    +
    + bus-width: true
    +
    + max-frequency: true
    +
    patternProperties:
    '^opp-table(-[a-z0-9]+)?$':
    if:
    @@ -140,7 +173,10 @@ required:
    - clock-names
    - interrupts

    -additionalProperties: true
    +allOf:
    + - $ref: mmc-controller.yaml#
    +
    +unevaluatedProperties: false

    examples:
    - |
    @@ -149,7 +185,7 @@ examples:
    #include <dt-bindings/clock/qcom,rpmh.h>
    #include <dt-bindings/power/qcom-rpmpd.h>

    - sdhc_2: sdhci@8804000 {
    + sdhc_2: mmc@8804000 {
    compatible = "qcom,sm8250-sdhci", "qcom,sdhci-msm-v5";
    reg = <0 0x08804000 0 0x1000>;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:44    [W:4.034 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site