On 19-09-18, 18:40, Bjorn Andersson wrote:
> The PMS405 provdies 5 SMPS regulators and 13 LDOs, add these to the RPM
> regulator driver.
Reviewed-by: Vinod Koul <vkoul@xxxxxxxxxx>
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> .../regulator/qcom,smd-rpm-regulator.txt | 23 ++++++
> drivers/regulator/qcom_smd-regulator.c | 77 +++++++++++++++++++
> 2 files changed, 100 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
> index 58a1d97972f5..45025b5b67f6 100644
> --- a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
> +++ b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
> @@ -26,6 +26,7 @@ Regulator nodes are identified by their compatible:
> "qcom,rpm-pm8998-regulators"
> "qcom,rpm-pma8084-regulators"
> "qcom,rpm-pmi8998-regulators"
> + "qcom,rpm-pms405-regulators"
>
> - vdd_s1-supply:
> - vdd_s2-supply:
> @@ -188,6 +189,24 @@ Regulator nodes are identified by their compatible:
> Definition: reference to regulator supplying the input pin, as
> described in the data sheet
>
> +- vdd_s1-supply:
> +- vdd_s2-supply:
> +- vdd_s3-supply:
> +- vdd_s4-supply:
> +- vdd_s5-supply:
> +- vdd_l1_l2-supply:
> +- vdd_l3_l8-supply:
> +- vdd_l4-supply:
> +- vdd_l5_l6-supply:
> +- vdd_l7-supply:
> +- vdd_l3_l8-supply:
> +- vdd_l9-supply:
> +- vdd_l10_l11_l12_l13-supply:
> + Usage: optional (pms405 only)
> + Value type: <phandle>
> + Definition: reference to regulator supplying the input pin, as
> + described in the data sheet
> +
> The regulator node houses sub-nodes for each regulator within the device. Each
> sub-node is identified using the node's name, with valid values listed for each
> of the pmics below.
> @@ -222,6 +241,10 @@ pma8084:
> pmi8998:
> bob
>
> +pms405:
> + s1, s2, s3, s4, s5, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12,
> + l13
> +
> The content of each sub-node is defined by the standard binding for regulators -
> see regulator.txt.
>
> diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
> index fe2fb36803e0..f5bca77d67c1 100644
> --- a/drivers/regulator/qcom_smd-regulator.c
> +++ b/drivers/regulator/qcom_smd-regulator.c
> @@ -420,6 +420,60 @@ static const struct regulator_desc pmi8998_bob = {
> .ops = &rpm_bob_ops,
> };
>
> +static const struct regulator_desc pms405_hfsmps3 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(320000, 0, 215, 8000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 216,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pms405_nldo300 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(312000, 0, 127, 8000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 128,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pms405_nldo1200 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(312000, 0, 127, 8000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 128,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pms405_pldo50 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(1664000, 0, 128, 16000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 129,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pms405_pldo150 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(1664000, 0, 128, 16000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 129,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> +static const struct regulator_desc pms405_pldo600 = {
> + .linear_ranges = (struct regulator_linear_range[]) {
> + REGULATOR_LINEAR_RANGE(1256000, 0, 98, 8000),
> + },
> + .n_linear_ranges = 1,
> + .n_voltages = 99,
> + .ops = &rpm_smps_ldo_ops,
> +};
> +
> struct rpm_regulator_data {
> const char *name;
> u32 type;
> @@ -661,6 +715,28 @@ static const struct rpm_regulator_data rpm_pmi8998_regulators[] = {
> {}
> };
>
> +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" },
> + { "s3", QCOM_SMD_RPM_SMPA, 3, &pms405_hfsmps3, "vdd_s3" },
> + { "s4", QCOM_SMD_RPM_SMPA, 4, &pms405_hfsmps3, "vdd_s4" },
> + { "s5", QCOM_SMD_RPM_SMPA, 5, &pms405_hfsmps3, "vdd_s5" },
> + { "l1", QCOM_SMD_RPM_LDOA, 1, &pms405_nldo1200, "vdd_l1_l2" },
> + { "l2", QCOM_SMD_RPM_LDOA, 2, &pms405_nldo1200, "vdd_l1_l2" },
> + { "l3", QCOM_SMD_RPM_LDOA, 3, &pms405_nldo1200, "vdd_l3_l8" },
> + { "l4", QCOM_SMD_RPM_LDOA, 4, &pms405_nldo300, "vdd_l4" },
> + { "l5", QCOM_SMD_RPM_LDOA, 5, &pms405_pldo600, "vdd_l5_l6" },
> + { "l6", QCOM_SMD_RPM_LDOA, 6, &pms405_pldo600, "vdd_l5_l6" },
> + { "l7", QCOM_SMD_RPM_LDOA, 7, &pms405_pldo150, "vdd_l7" },
> + { "l8", QCOM_SMD_RPM_LDOA, 8, &pms405_nldo1200, "vdd_l3_l8" },
> + { "l9", QCOM_SMD_RPM_LDOA, 9, &pms405_nldo1200, "vdd_l9" },
> + { "l10", QCOM_SMD_RPM_LDOA, 10, &pms405_pldo50, "vdd_l10_l11_l12_l13" },
> + { "l11", QCOM_SMD_RPM_LDOA, 11, &pms405_pldo150, "vdd_l10_l11_l12_l13" },
> + { "l12", QCOM_SMD_RPM_LDOA, 12, &pms405_pldo150, "vdd_l10_l11_l12_l13" },
> + { "l13", QCOM_SMD_RPM_LDOA, 13, &pms405_pldo150, "vdd_l10_l11_l12_l13" },
> + {}
> +};
> +
> static const struct of_device_id rpm_of_match[] = {
> { .compatible = "qcom,rpm-pm8841-regulators", .data = &rpm_pm8841_regulators },
> { .compatible = "qcom,rpm-pm8916-regulators", .data = &rpm_pm8916_regulators },
> @@ -669,6 +745,7 @@ static const struct of_device_id rpm_of_match[] = {
> { .compatible = "qcom,rpm-pm8998-regulators", .data = &rpm_pm8998_regulators },
> { .compatible = "qcom,rpm-pma8084-regulators", .data = &rpm_pma8084_regulators },
> { .compatible = "qcom,rpm-pmi8998-regulators", .data = &rpm_pmi8998_regulators },
> + { .compatible = "qcom,rpm-pms405-regulators", .data = &rpm_pms405_regulators },
> {}
> };
> MODULE_DEVICE_TABLE(of, rpm_of_match);
> --
> 2.18.0
--
~Vinod
