Message ID | 20230912050028.4804-2-otto.pflueger@abscue.de |
---|---|
State | Superseded |
Headers | show |
Series | genpd: qcom: rpmpd: Add MSM8917 and similar SoCs | expand |
On 12/09/2023 07:00, Otto Pflüger wrote: > The MSM8917, MSM8937 and QM215 SoCs have VDDCX and VDDMX power domains > controlled in voltage level mode. Define the MSM8937 and QM215 power > domains as aliases because these SoCs are similar to MSM8917 and may > share some parts of the device tree. > > Also add the compatibles for these SoCs to the documentation, with > qcom,msm8937-rpmpd using qcom,msm8917-rpmpd as a fallback compatible > because there are no known differences. QM215 is not compatible with > these because it uses different regulators. > > Signed-off-by: Otto Pflüger <otto.pflueger@abscue.de> > --- > .../devicetree/bindings/power/qcom,rpmpd.yaml | 79 ++++++++++--------- > include/dt-bindings/power/qcom-rpmpd.h | 21 +++++ > 2 files changed, 64 insertions(+), 36 deletions(-) > > diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml > index 9b03c41d3604..d4dac8b54045 100644 > --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml > +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml > @@ -15,42 +15,49 @@ description: > > properties: > compatible: > - enum: > - - qcom,mdm9607-rpmpd > - - qcom,msm8226-rpmpd > - - qcom,msm8909-rpmpd > - - qcom,msm8916-rpmpd > - - qcom,msm8939-rpmpd > - - qcom,msm8953-rpmpd > - - qcom,msm8976-rpmpd > - - qcom,msm8994-rpmpd > - - qcom,msm8996-rpmpd > - - qcom,msm8998-rpmpd > - - qcom,qcm2290-rpmpd > - - qcom,qcs404-rpmpd > - - qcom,qdu1000-rpmhpd > - - 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,sdm670-rpmhpd > - - qcom,sdm845-rpmhpd > - - qcom,sdx55-rpmhpd > - - qcom,sdx65-rpmhpd > - - qcom,sdx75-rpmhpd > - - qcom,sm6115-rpmpd > - - qcom,sm6125-rpmpd > - - qcom,sm6350-rpmhpd > - - qcom,sm6375-rpmpd > - - qcom,sm8150-rpmhpd > - - qcom,sm8250-rpmhpd > - - qcom,sm8350-rpmhpd > - - qcom,sm8450-rpmhpd > - - qcom,sm8550-rpmhpd > + 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 > + - qcom,msm8994-rpmpd > + - qcom,msm8996-rpmpd > + - qcom,msm8998-rpmpd > + - qcom,qcm2290-rpmpd > + - qcom,qcs404-rpmpd > + - qcom,qdu1000-rpmhpd > + - qcom,qm215-rpmpd > + - qcom,sa8155p-rpmhpd > + - qcom,sa8540p-rpmhpd > + - qcom,sa8775p-rpmhpd > + - qcom,sdm660-rpmpd Move it down to sort, while you are changing it. With above (and assumption if you ever need to rebase the patch you will be extra careful and re-check all entries): Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index 9b03c41d3604..d4dac8b54045 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -15,42 +15,49 @@ description: properties: compatible: - enum: - - qcom,mdm9607-rpmpd - - qcom,msm8226-rpmpd - - qcom,msm8909-rpmpd - - qcom,msm8916-rpmpd - - qcom,msm8939-rpmpd - - qcom,msm8953-rpmpd - - qcom,msm8976-rpmpd - - qcom,msm8994-rpmpd - - qcom,msm8996-rpmpd - - qcom,msm8998-rpmpd - - qcom,qcm2290-rpmpd - - qcom,qcs404-rpmpd - - qcom,qdu1000-rpmhpd - - 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,sdm670-rpmhpd - - qcom,sdm845-rpmhpd - - qcom,sdx55-rpmhpd - - qcom,sdx65-rpmhpd - - qcom,sdx75-rpmhpd - - qcom,sm6115-rpmpd - - qcom,sm6125-rpmpd - - qcom,sm6350-rpmhpd - - qcom,sm6375-rpmpd - - qcom,sm8150-rpmhpd - - qcom,sm8250-rpmhpd - - qcom,sm8350-rpmhpd - - qcom,sm8450-rpmhpd - - qcom,sm8550-rpmhpd + 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 + - qcom,msm8994-rpmpd + - qcom,msm8996-rpmpd + - qcom,msm8998-rpmpd + - 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,sdm670-rpmhpd + - qcom,sdm845-rpmhpd + - qcom,sdx55-rpmhpd + - qcom,sdx65-rpmhpd + - qcom,sdx75-rpmhpd + - qcom,sm6115-rpmpd + - qcom,sm6125-rpmpd + - qcom,sm6350-rpmhpd + - qcom,sm6375-rpmpd + - qcom,sm8150-rpmhpd + - qcom,sm8250-rpmhpd + - qcom,sm8350-rpmhpd + - qcom,sm8450-rpmhpd + - qcom,sm8550-rpmhpd + - items: + - enum: + - qcom,msm8937-rpmpd + - const: qcom,msm8917-rpmpd '#power-domain-cells': const: 1 diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 83be996cb5eb..7f4e2983a4c5 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -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
The MSM8917, MSM8937 and QM215 SoCs have VDDCX and VDDMX power domains controlled in voltage level mode. Define the MSM8937 and QM215 power domains as aliases because these SoCs are similar to MSM8917 and may share some parts of the device tree. Also add the compatibles for these SoCs to the documentation, with qcom,msm8937-rpmpd using qcom,msm8917-rpmpd as a fallback compatible because there are no known differences. QM215 is not compatible with these because it uses different regulators. Signed-off-by: Otto Pflüger <otto.pflueger@abscue.de> --- .../devicetree/bindings/power/qcom,rpmpd.yaml | 79 ++++++++++--------- include/dt-bindings/power/qcom-rpmpd.h | 21 +++++ 2 files changed, 64 insertions(+), 36 deletions(-)