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

Commit c6e2bd95 authored by Tony Lindgren's avatar Tony Lindgren Committed by Wolfram Sang
Browse files

i2c: omap: Use noirq system sleep pm ops to idle device for suspend 



We currently get the following error with pixcir_ts driver during a
suspend resume cycle:

omap_i2c 4802a000.i2c: controller timed out
pixcir_ts 1-005c: pixcir_int_enable: can't read reg 0x34 : -110
pixcir_ts 1-005c: Failed to disable interrupt generation: -110
pixcir_ts 1-005c: Failed to stop
dpm_run_callback(): pixcir_i2c_ts_resume+0x0/0x98
[pixcir_i2c_ts] returns -110
PM: Device 1-005c failed to resume: error -110

And at least am437x based devices with pixcir_ts will fail to resume
to a touchscreen that is configured as the wakeup-source in device
tree for these devices.

This is because pixcir_ts tries to reconfigure it's registers for
noirq suspend which fails. This also leaves i2c-omap in enabled state
for suspend.

Let's fix the pixcir_ts issue and make sure i2c-omap is suspended by
adding SET_NOIRQ_SYSTEM_SLEEP_PM_OPS.

Let's also get rid of some ifdefs while at it and replace them with
__maybe_unused as SET_RUNTIME_PM_OPS and SET_NOIRQ_SYSTEM_SLEEP_PM_OPS
already deal with the various PM Kconfig options.

Reported-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarVignesh R <vigneshr@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 8834f560

drivers/i2c/busses/i2c-omap.c

+5 −8
Original line number Diff line number Diff line
@@ -1500,8 +1500,7 @@ static int omap_i2c_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int omap_i2c_runtime_suspend(struct device *dev)

static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev)

{

	struct omap_i2c_dev *omap = dev_get_drvdata(dev);
@@ -1527,7 +1526,7 @@ static int omap_i2c_runtime_suspend(struct device *dev) 
	return 0;

}



static int omap_i2c_runtime_resume(struct device *dev)

static int __maybe_unused omap_i2c_runtime_resume(struct device *dev)

{

	struct omap_i2c_dev *omap = dev_get_drvdata(dev);
@@ -1542,20 +1541,18 @@ static int omap_i2c_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops omap_i2c_pm_ops = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				      pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,

			   omap_i2c_runtime_resume, NULL)

};

#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)

#else

#define OMAP_I2C_PM_OPS NULL

#endif /* CONFIG_PM */



static struct platform_driver omap_i2c_driver = {

	.probe		= omap_i2c_probe,

	.remove		= omap_i2c_remove,

	.driver		= {

		.name	= "omap_i2c",

		.pm	= OMAP_I2C_PM_OPS,

		.pm	= &omap_i2c_pm_ops,

		.of_match_table = of_match_ptr(omap_i2c_of_match),

	},

};