Commit 1188866d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:
 "Just one I2C driver update this time"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mediatek: Move suspend and resume handling to NOIRQ phase
parents 29bd2d21 de96c394

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 = {