aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2016-06-03 07:23:09 -0400
committerMark Brown <broonie@kernel.org>2016-06-08 06:59:25 -0400
commitd1e44b6b2823f1751ffe7e7589f545f05cfe2095 (patch)
tree11562334b3ba169da2111a64c412a244f5620a40
parenta8a47540ebe32f1733eebc3e5699af580ceaa3f5 (diff)
regulator: qcom_smd: add regulator ops for pm8941 lnldo
After "regulator: qcom_smd: add list_voltage callback" patch adding pm8941 lnldo regulators would bug on list_voltages as it is a fixed regulator without any linear range. This patch fixes that issue by adding dedicated ops for pm8941 lnldo without list_voltages callback. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org # v4.6
-rw-r--r--drivers/regulator/qcom_smd-regulator.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index b11b627a50db..6c7fe4778793 100644
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -148,6 +148,17 @@ static const struct regulator_ops rpm_smps_ldo_ops = {
148 .set_load = rpm_reg_set_load, 148 .set_load = rpm_reg_set_load,
149}; 149};
150 150
151static const struct regulator_ops rpm_smps_ldo_ops_fixed = {
152 .enable = rpm_reg_enable,
153 .disable = rpm_reg_disable,
154 .is_enabled = rpm_reg_is_enabled,
155
156 .get_voltage = rpm_reg_get_voltage,
157 .set_voltage = rpm_reg_set_voltage,
158
159 .set_load = rpm_reg_set_load,
160};
161
151static const struct regulator_ops rpm_switch_ops = { 162static const struct regulator_ops rpm_switch_ops = {
152 .enable = rpm_reg_enable, 163 .enable = rpm_reg_enable,
153 .disable = rpm_reg_disable, 164 .disable = rpm_reg_disable,
@@ -248,7 +259,7 @@ static const struct regulator_desc pm8941_nldo = {
248static const struct regulator_desc pm8941_lnldo = { 259static const struct regulator_desc pm8941_lnldo = {
249 .fixed_uV = 1740000, 260 .fixed_uV = 1740000,
250 .n_voltages = 1, 261 .n_voltages = 1,
251 .ops = &rpm_smps_ldo_ops, 262 .ops = &rpm_smps_ldo_ops_fixed,
252}; 263};
253 264
254static const struct regulator_desc pm8941_switch = { 265static const struct regulator_desc pm8941_switch = {