Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6394678e authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: wm8994: Don't use system PM operations 



For realistic systems the power management is controlled entirely via
runtime PM - if the device is not runtime suspended then the suspend
will abort without doing anything as functionality such as accessory
detection or audio bypass will require the device to be enabled while
if the device is runtime suspended it is already in the lowest power
state. This means that system suspend is redundant and can be removed
which avoids issues with attempting to double disable the regulators.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 7a93fb37

drivers/mfd/wm8994-core.c

+4 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static const char *wm8958_main_supplies[] = { 
	"SPKVDD2",

};



#ifdef CONFIG_PM

#ifdef CONFIG_PM_RUNTIME

static int wm8994_suspend(struct device *dev)

{

	struct wm8994 *wm8994 = dev_get_drvdata(dev);
@@ -724,8 +724,9 @@ static const struct i2c_device_id wm8994_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, wm8994_i2c_id);



static UNIVERSAL_DEV_PM_OPS(wm8994_pm_ops, wm8994_suspend, wm8994_resume,

			    NULL);

static const struct dev_pm_ops wm8994_pm_ops = {

	SET_RUNTIME_PM_OPS(wm8994_suspend, wm8994_resume, NULL)

};



static struct i2c_driver wm8994_i2c_driver = {

	.driver = {