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

Commit df3865f8 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 fixes from Wolfram Sang:
 "One PM related driver bugfix and a MAINTAINERS update"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
  i2c: omap: Use noirq system sleep pm ops to idle device for suspend
parents e8b50608 13c80dda

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -11312,10 +11312,12 @@ F: include/dt-bindings/ 


OPENCORES I2C BUS DRIVER

M:	Peter Korsgaard <peter@korsgaard.com>

M:	Andrew Lunn <andrew@lunn.ch>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-ocores

F:	drivers/i2c/busses/i2c-ocores.c

F:	include/linux/platform_data/i2c-ocores.h



OPENRISC ARCHITECTURE

M:	Jonas Bonn <jonas@southpole.se>

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),

	},

};