On Thu, Nov 10, 2022 at 10:17:36AM +0100, Konrad Dybcio wrote:
> PMR735a is already supported in the RPMH regulator driver, but
> there are cases where it's bundled with SMD RPM SoCs. Port it over
> to qcom_smd-regulator to enable usage in such cases.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Reviewed-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Regards,
Bjorn
> ---
> Changes since v1:
> - Add and use pmic5_ftsmps520 in place of pms405_hfsmps3 for s3
>
> drivers/regulator/qcom_smd-regulator.c | 33 ++++++++++++++++++++++++++
> include/linux/soc/qcom/smd-rpm.h | 2 ++
> 2 files changed, 35 insertions(+)
>
> diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
> index f98168d58dce..9f2b58458841 100644
> --- a/drivers/regulator/qcom_smd-regulator.c
> +++ b/drivers/regulator/qcom_smd-regulator.c
> @@ -677,6 +677,24 @@ static const struct regulator_desc pm6125_ftsmps = {
> .ops = &rpm_smps_ldo_ops,
> };
>
> +static const struct regulator_desc pmic5_ftsmps520 = {
> + .linear_ranges = (struct linear_range[]) {
> + REGULATOR_LINEAR_RANGE(300000, 0, 263, 4000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 264,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pmic5_hfsmps515 = {
> + .linear_ranges = (struct linear_range[]) {
> + REGULATOR_LINEAR_RANGE(320000, 0, 235, 16000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 236,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> static const struct regulator_desc pms405_hfsmps3 = {
> .linear_ranges = (struct linear_range[]) {
> REGULATOR_LINEAR_RANGE(320000, 0, 215, 8000),
> @@ -1265,6 +1283,20 @@ static const struct rpm_regulator_data rpm_pmi8998_regulators[] = {
> {}
> };
>
> +static const struct rpm_regulator_data rpm_pmr735a_regulators[] = {
> + { "s1", QCOM_SMD_RPM_SMPE, 1, &pmic5_ftsmps520, "vdd_s1"},
> + { "s2", QCOM_SMD_RPM_SMPE, 2, &pmic5_ftsmps520, "vdd_s2"},
> + { "s3", QCOM_SMD_RPM_SMPE, 3, &pmic5_hfsmps515, "vdd_s3"},
> + { "l1", QCOM_SMD_RPM_LDOE, 1, &pm660_nldo660, "vdd_l1_l2"},
> + { "l2", QCOM_SMD_RPM_LDOE, 2, &pm660_nldo660, "vdd_l1_l2"},
> + { "l3", QCOM_SMD_RPM_LDOE, 3, &pm660_nldo660, "vdd_l3"},
> + { "l4", QCOM_SMD_RPM_LDOE, 4, &pm660_ht_lvpldo, "vdd_l4"},
> + { "l5", QCOM_SMD_RPM_LDOE, 5, &pm660_nldo660, "vdd_l5_l6"},
> + { "l6", QCOM_SMD_RPM_LDOE, 6, &pm660_nldo660, "vdd_l5_l6"},
> + { "l7", QCOM_SMD_RPM_LDOE, 7, &pm660_pldo660, "vdd_l7_bob"},
> + {}
> +};
> +
> static const struct rpm_regulator_data rpm_pms405_regulators[] = {
> { "s1", QCOM_SMD_RPM_SMPA, 1, &pms405_hfsmps3, "vdd_s1" },
> { "s2", QCOM_SMD_RPM_SMPA, 2, &pms405_hfsmps3, "vdd_s2" },
> @@ -1305,6 +1337,7 @@ static const struct of_device_id rpm_of_match[] = {
> { .compatible = "qcom,rpm-pma8084-regulators", .data = &rpm_pma8084_regulators },
> { .compatible = "qcom,rpm-pmi8994-regulators", .data = &rpm_pmi8994_regulators },
> { .compatible = "qcom,rpm-pmi8998-regulators", .data = &rpm_pmi8998_regulators },
> + { .compatible = "qcom,rpm-pmr735a-regulators", .data = &rpm_pmr735a_regulators },
> { .compatible = "qcom,rpm-pms405-regulators", .data = &rpm_pms405_regulators },
> {}
> };
> diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h
> index 3ab8c07f71c0..62de54992e49 100644
> --- a/include/linux/soc/qcom/smd-rpm.h
> +++ b/include/linux/soc/qcom/smd-rpm.h
> @@ -19,6 +19,7 @@ struct qcom_smd_rpm;
> #define QCOM_SMD_RPM_CLK_BUF_A 0x616B6C63
> #define QCOM_SMD_RPM_LDOA 0x616f646c
> #define QCOM_SMD_RPM_LDOB 0x626F646C
> +#define QCOM_SMD_RPM_LDOE 0x656f646c
> #define QCOM_SMD_RPM_RWCX 0x78637772
> #define QCOM_SMD_RPM_RWMX 0x786d7772
> #define QCOM_SMD_RPM_RWLC 0x636c7772
> @@ -32,6 +33,7 @@ struct qcom_smd_rpm;
> #define QCOM_SMD_RPM_QUP_CLK 0x707571
> #define QCOM_SMD_RPM_SMPA 0x61706d73
> #define QCOM_SMD_RPM_SMPB 0x62706d73
> +#define QCOM_SMD_RPM_SMPE 0x65706d73
> #define QCOM_SMD_RPM_SPDM 0x63707362
> #define QCOM_SMD_RPM_VSA 0x00617376
> #define QCOM_SMD_RPM_MMAXI_CLK 0x69786d6d
> --
> 2.38.1
>
