提交 6ce286f1 编写于 作者: J Javier Martinez Canillas 提交者: Lee Jones

Revert "mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption"

This reverts commit b7cde707
("mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption")

Commit b7cde707 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: NDoug Anderson <dianders@chromium.org>
Signed-off-by: NJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: NChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: NDoug Anderson <dianders@chromium.org>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
上级 efa3ca41
...@@ -672,7 +672,6 @@ config MFD_SEC_CORE ...@@ -672,7 +672,6 @@ config MFD_SEC_CORE
select MFD_CORE select MFD_CORE
select REGMAP_I2C select REGMAP_I2C
select REGMAP_IRQ select REGMAP_IRQ
select REGULATOR
help help
Support for the Samsung Electronics MFD series. Support for the Samsung Electronics MFD series.
This driver provides common support for accessing the device, This driver provides common support for accessing the device,
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/mfd/samsung/s2mpu02.h> #include <linux/mfd/samsung/s2mpu02.h>
#include <linux/mfd/samsung/s5m8763.h> #include <linux/mfd/samsung/s5m8763.h>
#include <linux/mfd/samsung/s5m8767.h> #include <linux/mfd/samsung/s5m8767.h>
#include <linux/regulator/machine.h>
#include <linux/regmap.h> #include <linux/regmap.h>
static const struct mfd_cell s5m8751_devs[] = { static const struct mfd_cell s5m8751_devs[] = {
...@@ -461,15 +460,6 @@ static int sec_pmic_suspend(struct device *dev) ...@@ -461,15 +460,6 @@ static int sec_pmic_suspend(struct device *dev)
*/ */
disable_irq(sec_pmic->irq); disable_irq(sec_pmic->irq);
switch (sec_pmic->device_type) {
case S2MPS14X:
case S2MPU02:
regulator_suspend_prepare(PM_SUSPEND_MEM);
break;
default:
break;
}
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册