| Message ID | 01020191998a55a9-697c3a2c-237e-49bb-b3dd-45762198d74f-000000@eu-west-1.amazonses.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add device tree for ArmSoM Sige 5 board | expand |
On Wed, 28 Aug 2024 at 17:11, Detlev Casanova <detlev.casanova@collabora.com> wrote: > > The device is compatible with rk3588, so add an entry for the 2 > compatibles together. > > The rk3576 device has a power-domain that needs to be on for the eMMC to > be used. Add it as a requirement. > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> This one doesn't apply as I have other changes queued up. Can you please re-base and post a new version based upon git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git next. Kind regards Uffe > --- > .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 38 +++++++++++++------ > 1 file changed, 26 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml b/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml > index 4d3031d9965f..aff8106ec361 100644 > --- a/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml > +++ b/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml > @@ -10,18 +10,19 @@ maintainers: > - Ulf Hansson <ulf.hansson@linaro.org> > - Jisheng Zhang <Jisheng.Zhang@synaptics.com> > > -allOf: > - - $ref: mmc-controller.yaml# > - > properties: > compatible: > - enum: > - - rockchip,rk3568-dwcmshc > - - rockchip,rk3588-dwcmshc > - - snps,dwcmshc-sdhci > - - sophgo,cv1800b-dwcmshc > - - sophgo,sg2002-dwcmshc > - - thead,th1520-dwcmshc > + oneOf: > + - items: > + - const: rockchip,rk3576-dwcmshc > + - const: rockchip,rk3588-dwcmshc > + - enum: > + - rockchip,rk3568-dwcmshc > + - rockchip,rk3588-dwcmshc > + - snps,dwcmshc-sdhci > + - sophgo,cv1800b-dwcmshc > + - sophgo,sg2002-dwcmshc > + - thead,th1520-dwcmshc > > reg: > maxItems: 1 > @@ -38,7 +39,6 @@ properties: > - description: block clock for rockchip specified > - description: timer clock for rockchip specified > > - > clock-names: > minItems: 1 > items: > @@ -48,6 +48,9 @@ properties: > - const: block > - const: timer > > + power-domains: > + maxItems: 1 > + > resets: > maxItems: 5 > > @@ -63,7 +66,6 @@ properties: > description: Specify the number of delay for tx sampling. > $ref: /schemas/types.yaml#/definitions/uint8 > > - > required: > - compatible > - reg > @@ -71,6 +73,18 @@ required: > - clocks > - clock-names > > +allOf: > + - $ref: mmc-controller.yaml# > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3576-dwcmshc > + then: > + properties: > + power-domains: > + minItems: 1 > + > unevaluatedProperties: false > > examples: > -- > 2.46.0 >
diff --git a/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml b/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml index 4d3031d9965f..aff8106ec361 100644 --- a/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml +++ b/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml @@ -10,18 +10,19 @@ maintainers: - Ulf Hansson <ulf.hansson@linaro.org> - Jisheng Zhang <Jisheng.Zhang@synaptics.com> -allOf: - - $ref: mmc-controller.yaml# - properties: compatible: - enum: - - rockchip,rk3568-dwcmshc - - rockchip,rk3588-dwcmshc - - snps,dwcmshc-sdhci - - sophgo,cv1800b-dwcmshc - - sophgo,sg2002-dwcmshc - - thead,th1520-dwcmshc + oneOf: + - items: + - const: rockchip,rk3576-dwcmshc + - const: rockchip,rk3588-dwcmshc + - enum: + - rockchip,rk3568-dwcmshc + - rockchip,rk3588-dwcmshc + - snps,dwcmshc-sdhci + - sophgo,cv1800b-dwcmshc + - sophgo,sg2002-dwcmshc + - thead,th1520-dwcmshc reg: maxItems: 1 @@ -38,7 +39,6 @@ properties: - description: block clock for rockchip specified - description: timer clock for rockchip specified - clock-names: minItems: 1 items: @@ -48,6 +48,9 @@ properties: - const: block - const: timer + power-domains: + maxItems: 1 + resets: maxItems: 5 @@ -63,7 +66,6 @@ properties: description: Specify the number of delay for tx sampling. $ref: /schemas/types.yaml#/definitions/uint8 - required: - compatible - reg @@ -71,6 +73,18 @@ required: - clocks - clock-names +allOf: + - $ref: mmc-controller.yaml# + - if: + properties: + compatible: + contains: + const: rockchip,rk3576-dwcmshc + then: + properties: + power-domains: + minItems: 1 + unevaluatedProperties: false examples: