From: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx> The platform in question is a close cousin of SC8280XP, most notably lacking an on-SoC VDD_GFX rail, substituting it with an external regulator. The GPU_CC block was previously believed to only require a handle to some form of VDD_GFX, but that's now known not to be enough. Introduce a new compatible, using the SC8280XP fallback, to constrain a different number of power-domains and remove the pd-regulator exclusivity check, as it no longer applies. Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx> --- .../devicetree/bindings/clock/qcom,gpucc.yaml | 65 +++++++++++++--------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,gpucc.yaml b/Documentation/devicetree/bindings/clock/qcom,gpucc.yaml index 1a6f8889db35296b59973c90b8133abfed75baaf..3beb8f2c3d7a1b3f820c6452fc4000e6cfa14070 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gpucc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gpucc.yaml @@ -37,27 +37,31 @@ description: | properties: compatible: - enum: - - qcom,milos-gpucc - - qcom,qcs8300-gpucc - - qcom,sa8775p-gpucc - - qcom,sar2130p-gpucc - - qcom,sc7180-gpucc - - qcom,sc7280-gpucc - - qcom,sc8180x-gpucc - - qcom,sc8280xp-gpucc - - qcom,sdm845-gpucc - - qcom,sm4450-gpucc - - qcom,sm6350-gpucc - - qcom,sm8150-gpucc - - qcom,sm8250-gpucc - - qcom,sm8350-gpucc - - qcom,sm8450-gpucc - - qcom,sm8475-gpucc - - qcom,sm8550-gpucc - - qcom,sm8650-gpucc - - qcom,x1e80100-gpucc - - qcom,x1p42100-gpucc + oneOf: + - enum: + - qcom,milos-gpucc + - qcom,qcs8300-gpucc + - qcom,sa8775p-gpucc + - qcom,sar2130p-gpucc + - qcom,sc7180-gpucc + - qcom,sc7280-gpucc + - qcom,sc8180x-gpucc + - qcom,sc8280xp-gpucc + - qcom,sdm845-gpucc + - qcom,sm4450-gpucc + - qcom,sm6350-gpucc + - qcom,sm8150-gpucc + - qcom,sm8250-gpucc + - qcom,sm8350-gpucc + - qcom,sm8450-gpucc + - qcom,sm8475-gpucc + - qcom,sm8550-gpucc + - qcom,sm8650-gpucc + - qcom,x1e80100-gpucc + - qcom,x1p42100-gpucc + - items: + - const: qcom,sa8540p-gpucc + - const: qcom,sc8280xp-gpucc clocks: items: @@ -86,12 +90,6 @@ required: - power-domains - '#power-domain-cells' -# Require that power-domains and vdd-gfx-supply are not both present -not: - required: - - power-domains - - vdd-gfx-supply - allOf: - $ref: qcom,gcc.yaml# @@ -151,6 +149,19 @@ allOf: - description: CX power domain - description: MX power domain + - if: + properties: + compatible: + enum: + - qcom,sa8540p-gpucc + then: + properties: + power-domains: + items: + - description: CX power domain + - description: MX power domain + - description: MX_COLLAPSIBLE power domain + - if: properties: compatible: -- 2.50.1