Hi Jun,
On Mon, Aug 31, 2020 at 04:34:52PM +0800, Jun Nie wrote:
> Add the shared modemcx/cx/mx power-domains found on MSM8939.
>
> Signed-off-by: Jun Nie <jun.nie@xxxxxxxxxx>
> ---
> .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
> drivers/soc/qcom/rpmpd.c | 27 +++++++++++++++++++
> include/dt-bindings/power/qcom-rpmpd.h | 10 +++++++
> 3 files changed, 38 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
> index 8058955fb3b9..6051d6d3bf0e 100644
> --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
> +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
> @@ -20,6 +20,7 @@ properties:
> - qcom,msm8996-rpmpd
> - qcom,msm8998-rpmpd
> - qcom,qcs404-rpmpd
> + - qcom,msm8939-rpmpd
> - qcom,sc7180-rpmhpd
> - qcom,sdm845-rpmhpd
> - qcom,sm8150-rpmhpd
This is sorted alphabetically at the moment.
We should probably keep it that way. :)
> diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c
> index f2168e4259b2..7ae91df9a5ba 100644
> --- a/drivers/soc/qcom/rpmpd.c
> +++ b/drivers/soc/qcom/rpmpd.c
> @@ -220,11 +220,38 @@ static const struct rpmpd_desc qcs404_desc = {
> .max_state = RPM_SMD_LEVEL_BINNING,
> };
>
> +/* msm8939 RPM Power Domains */
> +DEFINE_RPMPD_PAIR(msm8939, vddmd, vddmd_ao, SMPA, CORNER, 1);
> +DEFINE_RPMPD_VFC(msm8939, vddmd_vfc, SMPA, 1);
> +
> +DEFINE_RPMPD_PAIR(msm8939, vddcx, vddcx_ao, SMPA, CORNER, 2);
> +DEFINE_RPMPD_VFC(msm8939, vddcx_vfc, SMPA, 2);
> +
> +DEFINE_RPMPD_PAIR(msm8939, vddmx, vddmx_ao, LDOA, CORNER, 3);
> +
> +static struct rpmpd *msm8939_rpmpds[] = {
> + [MSM8939_VDDMDCX] = &msm8939_vddmd,
> + [MSM8939_VDDMDCX_AO] = &msm8939_vddmd_ao,
> + [MSM8939_VDDMDCX_VFC] = &msm8939_vddmd_vfc,
> + [MSM8939_VDDCX] = &msm8939_vddcx,
> + [MSM8939_VDDCX_AO] = &msm8939_vddcx_ao,
> + [MSM8939_VDDCX_VFC] = &msm8939_vddcx_vfc,
> + [MSM8939_VDDMX] = &msm8939_vddmx,
> + [MSM8939_VDDMX_AO] = &msm8939_vddmx_ao,
> +};
> +
> +static const struct rpmpd_desc msm8939_desc = {
> + .rpmpds = msm8939_rpmpds,
> + .num_pds = ARRAY_SIZE(msm8939_rpmpds),
> + .max_state = RPM_SMD_LEVEL_TURBO_HIGH,
MSM8939 seems to be still using corners instead of levels,
so shouldn't you have max state = MAX_8996_RPMPD_STATE (= 6)?
> +};
> +
> static const struct of_device_id rpmpd_match_table[] = {
> { .compatible = "qcom,msm8976-rpmpd", .data = &msm8976_desc },
> { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc },
> { .compatible = "qcom,msm8998-rpmpd", .data = &msm8998_desc },
> { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
> + { .compatible = "qcom,msm8939-rpmpd", .data = &msm8939_desc },
Would be good to keep this alphabetically ordered as well.
> { }
> };
> MODULE_DEVICE_TABLE(of, rpmpd_match_table);
> diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h
> index dc146e44228b..4eb5d288e641 100644
> --- a/include/dt-bindings/power/qcom-rpmpd.h
> +++ b/include/dt-bindings/power/qcom-rpmpd.h
> @@ -101,6 +101,16 @@
> #define QCS404_LPIMX 5
> #define QCS404_LPIMX_VFL 6
>
> +/* MSM8939 Power Domains */
> +#define MSM8939_VDDMDCX 0
> +#define MSM8939_VDDMDCX_AO 1
> +#define MSM8939_VDDMDCX_VFC 2
> +#define MSM8939_VDDCX 3
> +#define MSM8939_VDDCX_AO 4
> +#define MSM8939_VDDCX_VFC 5
> +#define MSM8939_VDDMX 6
> +#define MSM8939_VDDMX_AO 7
> +
... and these defines above MSM8976.
Thanks!
Stephan
> /* RPM SMD Power Domain performance levels */
> #define RPM_SMD_LEVEL_RETENTION 16
> #define RPM_SMD_LEVEL_RETENTION_PLUS 32
> --
> 2.17.1
>
