summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMatt Wagner <mwagner@nvidia.com>2012-12-10 21:43:47 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:57:27 -0700
commit0b6ea76b21b7682d97d978b816a17d6aae975647 (patch)
tree09a11a64ee5f3dc22d8bb3316d0ac9cb99bbd183 /drivers
parented583ed956294028cc8c0160ccdc6b4099fd84cb (diff)
drivers: mfd: palmas: make smps10_boost_disable optional
Allow the board to pick whether they want to disable smps10_boost on suspend Bug 1172908 Change-Id: I0121f7e24716eb8731af3b14100d81ef63168929 Signed-off-by: Matt Wagner <mwagner@nvidia.com> Reviewed-on: http://git-master/r/170340 (cherry picked from commit 4c6a241b1433362447782e047f7b78226362ea47) Signed-off-by: Richard Zhao <rizhao@nvidia.com> Change-Id: I56a0e8fec03fa47547052a965aa123f88517ca70 Reviewed-on: http://git-master/r/196901 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/palmas-regulator.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 3adbbeadaccc..fbc87933abea 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -1330,7 +1330,8 @@ static int palmas_suspend(struct device *dev)
if (pdata->enable_ldo8_tracking && pdata->disabe_ldo8_tracking_suspend)
palmas_disable_ldo8_track(palmas);
- palmas_disable_smps10_boost(palmas);
+ if (pdata->disable_smps10_boost_suspend)
+ palmas_disable_smps10_boost(palmas);
return 0;
}
@@ -1343,7 +1344,8 @@ static int palmas_resume(struct device *dev)
if (pdata->enable_ldo8_tracking && pdata->disabe_ldo8_tracking_suspend)
palmas_enable_ldo8_track(palmas);
- palmas_enable_smps10_boost(palmas);
+ if (pdata->disable_smps10_boost_suspend)
+ palmas_enable_smps10_boost(palmas);
return 0;
}
#endif