Commit 6ce286f1 authored Oct 20, 2014 by Javier Martinez Canillas Committed by Lee Jones Nov 25, 2014

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: 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>

parent efa3ca41

drivers/mfd/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -672,7 +672,6 @@ config MFD_SEC_CORE
		select MFD_CORE
		select REGMAP_I2C
		select REGMAP_IRQ
		select REGULATOR
		help
		Support for the Samsung Electronics MFD series.
		This driver provides common support for accessing the device,

drivers/mfd/sec-core.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#include <linux/mfd/samsung/s2mpu02.h>
		#include <linux/mfd/samsung/s5m8763.h>
		#include <linux/mfd/samsung/s5m8767.h>
		#include <linux/regulator/machine.h>
		#include <linux/regmap.h>

		static const struct mfd_cell s5m8751_devs[] = {
		@@ -461,15 +460,6 @@ static int sec_pmic_suspend(struct device *dev)
		*/
		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;
		}

Admin message