Kaanapali (SM8850) has two display GDSCs. CORE_GDSC supplies shared MDSS hardware and most of the DPU, while INT2 GDSC supplies the VIG2/VIG3/DMA5 source pipes. Without INT2 GDSC, these source pipes remain inaccessible.
Describe CORE and INT2 as power domains of the DPU device, matching the hardware partitioning. INT2 only supplies DPU-local source pipes, while CORE also remains attached to the parent MDSS device because it supplies shared MDSS hardware. DPU performance-state votes on CORE are propagated through the genpd hierarchy to its parent MMCX domain. Keep the widest valid power-domain constraint in dpu-common.yaml and narrow it in each platform-specific binding. Require two domains and their names for Kaanapali, while retaining the existing single-domain constraint for all other DPU platforms. Signed-off-by: Yongxing Mou <[email protected]> --- .../bindings/display/msm/dpu-common.yaml | 3 ++- .../bindings/display/msm/qcom,kaanapali-mdss.yaml | 4 +++- .../bindings/display/msm/qcom,msm8998-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sc7180-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sc7280-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sc8180x-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sdm845-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sm6115-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sm6150-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sm7150-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sm8150-dpu.yaml | 3 +++ .../bindings/display/msm/qcom,sm8650-dpu.yaml | 26 ++++++++++++++++++++++ 13 files changed, 61 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dpu-common.yaml b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml index 3f953aa5e694..c67199011f26 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-common.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-common.yaml @@ -26,7 +26,8 @@ properties: maxItems: 1 power-domains: - maxItems: 1 + minItems: 1 + maxItems: 2 operating-points-v2: true opp-table: diff --git a/Documentation/devicetree/bindings/display/msm/qcom,kaanapali-mdss.yaml b/Documentation/devicetree/bindings/display/msm/qcom,kaanapali-mdss.yaml index 9f935defd6b1..6d6391970d6b 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,kaanapali-mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,kaanapali-mdss.yaml @@ -125,7 +125,9 @@ examples: operating-points-v2 = <&mdp_opp_table>; - power-domains = <&rpmhpd RPMHPD_MMCX>; + power-domains = <&mdss_gdsc>, + <&mdss_int2_gdsc>; + power-domain-names = "core", "int2"; ports { #address-cells = <1>; diff --git a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml index d5a64c8a921f..bded43a34b87 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml @@ -15,6 +15,9 @@ properties: compatible: const: qcom,msm8998-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml index 034d3df8d247..6c1476a0faaf 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml @@ -19,6 +19,9 @@ properties: - const: qcom,shikra-dpu - const: qcom,qcm2290-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml index 8137618237ce..3fa0f02f4489 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml @@ -19,6 +19,9 @@ properties: - qcom,sm6350-dpu - qcom,sm6375-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml index df9ec15ad6c3..7703d9b017cf 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml @@ -24,6 +24,9 @@ properties: - qcom,sm8450-dpu - qcom,sm8550-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sc8180x-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sc8180x-dpu.yaml index a411126708b8..8e10f9e0d176 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sc8180x-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sc8180x-dpu.yaml @@ -15,6 +15,9 @@ properties: compatible: const: qcom,sc8180x-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml index dc11fd421a27..9dafe1d827e1 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml @@ -17,6 +17,9 @@ properties: - qcom,sdm670-dpu - qcom,sdm845-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml index 510eb6c19364..173c2f034241 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml @@ -15,6 +15,9 @@ properties: compatible: const: qcom,sm6115-dpu + power-domains: + maxItems: 1 + reg: items: - description: MDP register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml index 8cbf99f9fcba..b8344ff8895a 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml @@ -16,6 +16,9 @@ properties: compatible: const: qcom,sm6150-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml index c79b2d442800..8e50942f3e1f 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml @@ -15,6 +15,9 @@ properties: compatible: const: qcom,sm7150-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml index a88d22f30a60..b407bc399462 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml @@ -17,6 +17,9 @@ properties: - qcom,sm8150-dpu - qcom,sm8250-dpu + power-domains: + maxItems: 1 + reg: items: - description: Address offset and size for mdp register set diff --git a/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml b/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml index aa0cf0ec5b93..7f8e52d52078 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml @@ -61,6 +61,32 @@ required: - clocks - clock-names +allOf: + - if: + properties: + compatible: + const: qcom,kaanapali-dpu + required: + - compatible + then: + properties: + power-domains: + minItems: 2 + + power-domain-names: + items: + - const: core + - const: int2 + + required: + - power-domain-names + else: + properties: + power-domains: + maxItems: 1 + + power-domain-names: false + unevaluatedProperties: false examples: -- 2.43.0
