Commit de96c394 authored by Qii Wang's avatar Qii Wang Committed by Wolfram Sang
Browse files

i2c: mediatek: Move suspend and resume handling to NOIRQ phase 



Some i2c device driver indirectly uses I2C driver when it is now
being suspended. The i2c devices driver is suspended during the
NOIRQ phase and this cannot be changed due to other dependencies.
Therefore, we also need to move the suspend handling for the I2C
controller driver to the NOIRQ phase as well.

Signed-off-by: default avatarQii Wang <qii.wang@mediatek.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 6ee1d745

drivers/i2c/busses/i2c-mt65xx.c

+16 −3
Original line number Diff line number Diff line
@@ -1275,7 +1275,8 @@ static int mtk_i2c_probe(struct platform_device *pdev) 
	mtk_i2c_clock_disable(i2c);



	ret = devm_request_irq(&pdev->dev, irq, mtk_i2c_irq,

			       IRQF_TRIGGER_NONE, I2C_DRV_NAME, i2c);

			       IRQF_NO_SUSPEND | IRQF_TRIGGER_NONE,

			       I2C_DRV_NAME, i2c);

	if (ret < 0) {

		dev_err(&pdev->dev,

			"Request I2C IRQ %d fail\n", irq);
@@ -1302,7 +1303,16 @@ static int mtk_i2c_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM_SLEEP

static int mtk_i2c_resume(struct device *dev)

static int mtk_i2c_suspend_noirq(struct device *dev)

{

	struct mtk_i2c *i2c = dev_get_drvdata(dev);



	i2c_mark_adapter_suspended(&i2c->adap);



	return 0;

}



static int mtk_i2c_resume_noirq(struct device *dev)

{

	int ret;

	struct mtk_i2c *i2c = dev_get_drvdata(dev);
@@ -1317,12 +1327,15 @@ static int mtk_i2c_resume(struct device *dev) 


	mtk_i2c_clock_disable(i2c);



	i2c_mark_adapter_resumed(&i2c->adap);



	return 0;

}

#endif



static const struct dev_pm_ops mtk_i2c_pm = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, mtk_i2c_resume)

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_i2c_suspend_noirq,

				      mtk_i2c_resume_noirq)

};



static struct platform_driver mtk_i2c_driver = {