Commit 1817d56e authored by Ulf Hansson's avatar Ulf Hansson
Browse files

pmdomain: Merge branch genpd_dt into next 



Merge the immutable branch genpd_dt into next, to allow the DT bindings to
be tested together with new pmdomain changes that are targeted for v6.7.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 55089e1f 61848698

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+44 −37
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,mdm9607-rpmpd

          - qcom,msm8226-rpmpd

          - qcom,msm8909-rpmpd

          - qcom,msm8916-rpmpd

          - qcom,msm8917-rpmpd

          - qcom,msm8939-rpmpd

          - qcom,msm8953-rpmpd

          - qcom,msm8976-rpmpd
@@ -29,14 +31,15 @@ properties: 
          - qcom,qcm2290-rpmpd

          - qcom,qcs404-rpmpd

          - qcom,qdu1000-rpmhpd

          - qcom,qm215-rpmpd

          - qcom,sa8155p-rpmhpd

          - qcom,sa8540p-rpmhpd

          - qcom,sa8775p-rpmhpd

      - qcom,sdm660-rpmpd

          - qcom,sc7180-rpmhpd

          - qcom,sc7280-rpmhpd

          - qcom,sc8180x-rpmhpd

          - qcom,sc8280xp-rpmhpd

          - qcom,sdm660-rpmpd

          - qcom,sdm670-rpmhpd

          - qcom,sdm845-rpmhpd

          - qcom,sdx55-rpmhpd
@@ -52,6 +55,10 @@ properties: 
          - qcom,sm8350-rpmhpd

          - qcom,sm8450-rpmhpd

          - qcom,sm8550-rpmhpd

      - items:

          - enum:

              - qcom,msm8937-rpmpd

          - const: qcom,msm8917-rpmpd



  '#power-domain-cells':

    const: 1

include/dt-bindings/power/qcom-rpmpd.h

+21 −0
Original line number Diff line number Diff line
@@ -278,6 +278,27 @@ 
#define MSM8909_VDDMX		MSM8916_VDDMX

#define MSM8909_VDDMX_AO	MSM8916_VDDMX_AO



/* MSM8917 Power Domain Indexes */

#define MSM8917_VDDCX		0

#define MSM8917_VDDCX_AO	1

#define MSM8917_VDDCX_VFL	2

#define MSM8917_VDDMX		3

#define MSM8917_VDDMX_AO	4



/* MSM8937 Power Domain Indexes */

#define MSM8937_VDDCX		MSM8917_VDDCX

#define MSM8937_VDDCX_AO	MSM8917_VDDCX_AO

#define MSM8937_VDDCX_VFL	MSM8917_VDDCX_VFL

#define MSM8937_VDDMX		MSM8917_VDDMX

#define MSM8937_VDDMX_AO	MSM8917_VDDMX_AO



/* QM215 Power Domain Indexes */

#define QM215_VDDCX		MSM8917_VDDCX

#define QM215_VDDCX_AO		MSM8917_VDDCX_AO

#define QM215_VDDCX_VFL		MSM8917_VDDCX_VFL

#define QM215_VDDMX		MSM8917_VDDMX

#define QM215_VDDMX_AO		MSM8917_VDDMX_AO



/* MSM8953 Power Domain Indexes */

#define MSM8953_VDDMD		0

#define MSM8953_VDDMD_AO	1