opp: core: add regulators enable and disable

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 <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 9ff0538ee83a015d68af4425547a9998656d28eb..3b7ffd0234e9c7c44a1bcbd9b924a1879b9e4207 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -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;
        }
 
@@ -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;
@@ -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);