Skip to content

Commit

Permalink
opp: core: add regulators enable and disable
Browse files Browse the repository at this point in the history
Add enable regulators to dev_pm_opp_set_regulators() and disable
regulators to dev_pm_opp_put_regulators(). Even if bootloader
leaves regulators enabled, they should be enabled in kernel in
order to increase the reference count.

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
k.konieczny@partner.samsung.com authored and Viresh Kumar committed Jul 26, 2019
1 parent 11e1a16 commit 7f93ff7
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions drivers/opp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,12 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
goto free_regulators;
}

ret = regulator_enable(reg);
if (ret < 0) {
regulator_put(reg);
goto free_regulators;
}

opp_table->regulators[i] = reg;
}

Expand All @@ -1639,8 +1645,10 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
return opp_table;

free_regulators:
while (i != 0)
regulator_put(opp_table->regulators[--i]);
while (i--) {
regulator_disable(opp_table->regulators[i]);
regulator_put(opp_table->regulators[i]);
}

kfree(opp_table->regulators);
opp_table->regulators = NULL;
Expand All @@ -1666,8 +1674,10 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));

for (i = opp_table->regulator_count - 1; i >= 0; i--)
for (i = opp_table->regulator_count - 1; i >= 0; i--) {
regulator_disable(opp_table->regulators[i]);
regulator_put(opp_table->regulators[i]);
}

_free_set_opp_data(opp_table);

Expand Down

0 comments on commit 7f93ff7

Please sign in to comment.