| Message ID | 20210615074543.26700-6-bhupesh.sharma@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: Add SA8155p-adp board DTS | expand |
On Tue 15 Jun 02:45 CDT 2021, Bhupesh Sharma wrote: > Cleanup the qcom-rpmh regulator driver: > - remove comma(s) at the end of the terminator line. > - add missing terminator in instances of > pm7325x_vreg_data[] arrays. This second part needs a: Fixes: c4e5aa3dbee5 ("regulator: qcom-rpmh: Add PM7325/PMR735A regulator support") So it's up to Mark if he wants both parts in a single patch. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Vinod Koul <vkoul@kernel.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Andy Gross <agross@kernel.org> I don't think these Cc tags serves a purpose here. The patch itself looks good though Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > drivers/regulator/qcom-rpmh-regulator.c | 26 +++++++++++++------------ > 1 file changed, 14 insertions(+), 12 deletions(-) > > diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c > index 22fec370fa61..af41a517da99 100644 > --- a/drivers/regulator/qcom-rpmh-regulator.c > +++ b/drivers/regulator/qcom-rpmh-regulator.c > @@ -811,12 +811,12 @@ static const struct rpmh_vreg_init_data pm8998_vreg_data[] = { > RPMH_VREG("ldo28", "ldo%s28", &pmic4_pldo, "vdd-l16-l28"), > RPMH_VREG("lvs1", "vs%s1", &pmic4_lvs, "vin-lvs-1-2"), > RPMH_VREG("lvs2", "vs%s2", &pmic4_lvs, "vin-lvs-1-2"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pmi8998_vreg_data[] = { > RPMH_VREG("bob", "bob%s1", &pmic4_bob, "vdd-bob"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { > @@ -824,7 +824,7 @@ static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { > RPMH_VREG("smps2", "smp%s2", &pmic4_ftsmps426, "vdd-s2"), > RPMH_VREG("smps3", "smp%s3", &pmic4_ftsmps426, "vdd-s3"), > RPMH_VREG("smps4", "smp%s4", &pmic4_ftsmps426, "vdd-s4"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { > @@ -856,7 +856,7 @@ static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { > RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l13-l16-l17"), > RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l13-l16-l17"), > RPMH_VREG("ldo18", "ldo%s18", &pmic5_nldo, "vdd-l3-l4-l5-l18"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { > @@ -880,7 +880,7 @@ static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { > RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), > RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), > RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8350_vreg_data[] = { > @@ -906,7 +906,7 @@ static const struct rpmh_vreg_init_data pm8350_vreg_data[] = { > RPMH_VREG("ldo8", "ldo%s8", &pmic5_nldo, "vdd-l8"), > RPMH_VREG("ldo9", "ldo%s9", &pmic5_nldo, "vdd-l6-l9-l10"), > RPMH_VREG("ldo10", "ldo%s10", &pmic5_nldo, "vdd-l6-l9-l10"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8350c_vreg_data[] = { > @@ -934,7 +934,7 @@ static const struct rpmh_vreg_init_data pm8350c_vreg_data[] = { > RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo_lv, "vdd-l1-l12"), > RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l3-l4-l5-l7-l13"), > RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { > @@ -947,7 +947,7 @@ static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { > RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), > RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), > RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l7"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { > @@ -960,7 +960,7 @@ static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { > RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), > RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), > RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm6150_vreg_data[] = { > @@ -988,7 +988,7 @@ static const struct rpmh_vreg_init_data pm6150_vreg_data[] = { > RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), > RPMH_VREG("ldo18", "ldo%s18", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), > RPMH_VREG("ldo19", "ldo%s19", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm6150l_vreg_data[] = { > @@ -1012,7 +1012,7 @@ static const struct rpmh_vreg_init_data pm6150l_vreg_data[] = { > RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), > RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), > RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pmx55_vreg_data[] = { > @@ -1039,7 +1039,7 @@ static const struct rpmh_vreg_init_data pmx55_vreg_data[] = { > RPMH_VREG("ldo14", "ldo%s14", &pmic5_nldo, "vdd-l14"), > RPMH_VREG("ldo15", "ldo%s15", &pmic5_nldo, "vdd-l15"), > RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l16"), > - {}, > + {} > }; > > static const struct rpmh_vreg_init_data pm7325_vreg_data[] = { > @@ -1070,6 +1070,7 @@ static const struct rpmh_vreg_init_data pm7325_vreg_data[] = { > RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), > RPMH_VREG("ldo18", "ldo%s18", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), > RPMH_VREG("ldo19", "ldo%s19", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), > + {} > }; > > static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = { > @@ -1083,6 +1084,7 @@ static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = { > RPMH_VREG("ldo5", "ldo%s5", &pmic5_nldo, "vdd-l5-l6"), > RPMH_VREG("ldo6", "ldo%s6", &pmic5_nldo, "vdd-l5-l6"), > RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-bob"), > + {} > }; > > static int rpmh_regulator_probe(struct platform_device *pdev) > -- > 2.31.1 >
diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c index 22fec370fa61..af41a517da99 100644 --- a/drivers/regulator/qcom-rpmh-regulator.c +++ b/drivers/regulator/qcom-rpmh-regulator.c @@ -811,12 +811,12 @@ static const struct rpmh_vreg_init_data pm8998_vreg_data[] = { RPMH_VREG("ldo28", "ldo%s28", &pmic4_pldo, "vdd-l16-l28"), RPMH_VREG("lvs1", "vs%s1", &pmic4_lvs, "vin-lvs-1-2"), RPMH_VREG("lvs2", "vs%s2", &pmic4_lvs, "vin-lvs-1-2"), - {}, + {} }; static const struct rpmh_vreg_init_data pmi8998_vreg_data[] = { RPMH_VREG("bob", "bob%s1", &pmic4_bob, "vdd-bob"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { @@ -824,7 +824,7 @@ static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { RPMH_VREG("smps2", "smp%s2", &pmic4_ftsmps426, "vdd-s2"), RPMH_VREG("smps3", "smp%s3", &pmic4_ftsmps426, "vdd-s3"), RPMH_VREG("smps4", "smp%s4", &pmic4_ftsmps426, "vdd-s4"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { @@ -856,7 +856,7 @@ static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l13-l16-l17"), RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l13-l16-l17"), RPMH_VREG("ldo18", "ldo%s18", &pmic5_nldo, "vdd-l3-l4-l5-l18"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { @@ -880,7 +880,7 @@ static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8350_vreg_data[] = { @@ -906,7 +906,7 @@ static const struct rpmh_vreg_init_data pm8350_vreg_data[] = { RPMH_VREG("ldo8", "ldo%s8", &pmic5_nldo, "vdd-l8"), RPMH_VREG("ldo9", "ldo%s9", &pmic5_nldo, "vdd-l6-l9-l10"), RPMH_VREG("ldo10", "ldo%s10", &pmic5_nldo, "vdd-l6-l9-l10"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8350c_vreg_data[] = { @@ -934,7 +934,7 @@ static const struct rpmh_vreg_init_data pm8350c_vreg_data[] = { RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo_lv, "vdd-l1-l12"), RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l3-l4-l5-l7-l13"), RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { @@ -947,7 +947,7 @@ static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l7"), - {}, + {} }; static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { @@ -960,7 +960,7 @@ static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = { RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), - {}, + {} }; static const struct rpmh_vreg_init_data pm6150_vreg_data[] = { @@ -988,7 +988,7 @@ static const struct rpmh_vreg_init_data pm6150_vreg_data[] = { RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), RPMH_VREG("ldo18", "ldo%s18", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), RPMH_VREG("ldo19", "ldo%s19", &pmic5_pldo, "vdd-l5-l16-l17-l18-l19"), - {}, + {} }; static const struct rpmh_vreg_init_data pm6150l_vreg_data[] = { @@ -1012,7 +1012,7 @@ static const struct rpmh_vreg_init_data pm6150l_vreg_data[] = { RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), - {}, + {} }; static const struct rpmh_vreg_init_data pmx55_vreg_data[] = { @@ -1039,7 +1039,7 @@ static const struct rpmh_vreg_init_data pmx55_vreg_data[] = { RPMH_VREG("ldo14", "ldo%s14", &pmic5_nldo, "vdd-l14"), RPMH_VREG("ldo15", "ldo%s15", &pmic5_nldo, "vdd-l15"), RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l16"), - {}, + {} }; static const struct rpmh_vreg_init_data pm7325_vreg_data[] = { @@ -1070,6 +1070,7 @@ static const struct rpmh_vreg_init_data pm7325_vreg_data[] = { RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), RPMH_VREG("ldo18", "ldo%s18", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), RPMH_VREG("ldo19", "ldo%s19", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), + {} }; static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = { @@ -1083,6 +1084,7 @@ static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = { RPMH_VREG("ldo5", "ldo%s5", &pmic5_nldo, "vdd-l5-l6"), RPMH_VREG("ldo6", "ldo%s6", &pmic5_nldo, "vdd-l5-l6"), RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-bob"), + {} }; static int rpmh_regulator_probe(struct platform_device *pdev)
Cleanup the qcom-rpmh regulator driver: - remove comma(s) at the end of the terminator line. - add missing terminator in instances of pm7325x_vreg_data[] arrays. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Vinod Koul <vkoul@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Andy Gross <agross@kernel.org> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> --- drivers/regulator/qcom-rpmh-regulator.c | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)