| Message ID | 20240311-linux-next-camcc-fixes-v1-1-d126ae0b9350@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qcom: clk: camcc: Fix power-domain definitions on x1e80100 | expand |
On 11/03/2024 01:33, Bryan O'Donoghue wrote: > camcc on x1e80100 requires two power domains MXC and MMCX. Define those as > part of the schema. > ... > > required-opps: > maxItems: 1 > @@ -56,6 +52,35 @@ required: > - power-domains > - required-opps > > +allOf: > + - $ref: qcom,gcc.yaml# > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sc8280xp-camcc > + - qcom,sm8450-camcc > + - qcom,sm8550-camcc > + then: > + properties: > + power-domains: > + description: > + A phandle and PM domain specifier for the MMCX power domain. This does not narrow the number of items. You need items with description, just like you have for x1e. And drop redundant parts. This is just "MMCX power domain" > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,x1e80100-camcc > + then: > + properties: > + power-domains: > + items: > + - description: A phandle and PM domain specifier for the MXC power domain. Drop redundant parts of description: MXC power domain > + - description: A phandle and PM domain specifier for the MMCX power domain. MMCX power domain Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml index fa0e5b6b02b81..eae9b73ae1f16 100644 --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml @@ -19,9 +19,6 @@ description: | include/dt-bindings/clock/qcom,sc8280xp-camcc.h include/dt-bindings/clock/qcom,x1e80100-camcc.h -allOf: - - $ref: qcom,gcc.yaml# - properties: compatible: enum: @@ -38,9 +35,8 @@ properties: - description: Sleep clock source power-domains: - maxItems: 1 - description: - A phandle and PM domain specifier for the MMCX power domain. + minItems: 1 + maxItems: 2 required-opps: maxItems: 1 @@ -56,6 +52,35 @@ required: - power-domains - required-opps +allOf: + - $ref: qcom,gcc.yaml# + - if: + properties: + compatible: + contains: + enum: + - qcom,sc8280xp-camcc + - qcom,sm8450-camcc + - qcom,sm8550-camcc + then: + properties: + power-domains: + description: + A phandle and PM domain specifier for the MMCX power domain. + + - if: + properties: + compatible: + contains: + enum: + - qcom,x1e80100-camcc + then: + properties: + power-domains: + items: + - description: A phandle and PM domain specifier for the MXC power domain. + - description: A phandle and PM domain specifier for the MMCX power domain. + unevaluatedProperties: false examples:
camcc on x1e80100 requires two power domains MXC and MMCX. Define those as part of the schema. Fixes: 76126a5129b5 ("clk: qcom: Add camcc clock driver for x1e80100") Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../bindings/clock/qcom,sm8450-camcc.yaml | 37 ++++++++++++++++++---- 1 file changed, 31 insertions(+), 6 deletions(-)