aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2014-10-20 17:05:50 -0400
committerLee Jones <lee.jones@linaro.org>2014-11-25 11:18:47 -0500
commit6ce286f182e22837a02a368eeb49a0057b2cd5f9 (patch)
tree71940f7a54d2d70d66a8f4929837a0c6637a34a8 /drivers/mfd
parentefa3ca414be9b930774b5c1a3190f735596f5115 (diff)
Revert "mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption"
This reverts commit b7cde7078d2344073c310aa65fc2b0a845d2cb5b ("mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption") Commit b7cde7078d23 called regulator_suspend_prepare() to prepare the regulators for a suspend state. But it did from the device pm suspend handler while the regulator suspend prepare function iterates over all regulators and not only the one managed by this device so it doesn't seems to be correct to call it from within a device driver. It is better to call the regulator suspend prepare/finish functions from platform code instead so this patch reverts the mentioned commit. Suggested-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig1
-rw-r--r--drivers/mfd/sec-core.c10
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index bd4a155a9564..72d38081f779 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -672,7 +672,6 @@ config MFD_SEC_CORE
672 select MFD_CORE 672 select MFD_CORE
673 select REGMAP_I2C 673 select REGMAP_I2C
674 select REGMAP_IRQ 674 select REGMAP_IRQ
675 select REGULATOR
676 help 675 help
677 Support for the Samsung Electronics MFD series. 676 Support for the Samsung Electronics MFD series.
678 This driver provides common support for accessing the device, 677 This driver provides common support for accessing the device,
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index b39960532f76..0a7bc43db4e4 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -32,7 +32,6 @@
32#include <linux/mfd/samsung/s2mpu02.h> 32#include <linux/mfd/samsung/s2mpu02.h>
33#include <linux/mfd/samsung/s5m8763.h> 33#include <linux/mfd/samsung/s5m8763.h>
34#include <linux/mfd/samsung/s5m8767.h> 34#include <linux/mfd/samsung/s5m8767.h>
35#include <linux/regulator/machine.h>
36#include <linux/regmap.h> 35#include <linux/regmap.h>
37 36
38static const struct mfd_cell s5m8751_devs[] = { 37static const struct mfd_cell s5m8751_devs[] = {
@@ -461,15 +460,6 @@ static int sec_pmic_suspend(struct device *dev)
461 */ 460 */
462 disable_irq(sec_pmic->irq); 461 disable_irq(sec_pmic->irq);
463 462
464 switch (sec_pmic->device_type) {
465 case S2MPS14X:
466 case S2MPU02:
467 regulator_suspend_prepare(PM_SUSPEND_MEM);
468 break;
469 default:
470 break;
471 }
472
473 return 0; 463 return 0;
474} 464}
475 465