Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-8
+2
MAINTAINERS
+2
MAINTAINERS
···
11312
11312
11313
11313
OPENCORES I2C BUS DRIVER
11314
11314
M: Peter Korsgaard <peter@korsgaard.com>
11315
+
M: Andrew Lunn <andrew@lunn.ch>
11315
11316
L: linux-i2c@vger.kernel.org
11316
11317
S: Maintained
11317
11318
F: Documentation/i2c/busses/i2c-ocores
11318
11319
F: drivers/i2c/busses/i2c-ocores.c
11320
+
F: include/linux/platform_data/i2c-ocores.h
11319
11321
11320
11322
OPENRISC ARCHITECTURE
11321
11323
M: Jonas Bonn <jonas@southpole.se>
+5
-8
drivers/i2c/busses/i2c-omap.c
+5
-8
drivers/i2c/busses/i2c-omap.c
···
1500
1500
return 0;
1501
1501
}
1502
1502
1503
-
#ifdef CONFIG_PM
1504
-
static int omap_i2c_runtime_suspend(struct device *dev)
1503
+
static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev)
1505
1504
{
1506
1505
struct omap_i2c_dev *omap = dev_get_drvdata(dev);
1507
1506
···
1526
1527
return 0;
1527
1528
}
1528
1529
1529
-
static int omap_i2c_runtime_resume(struct device *dev)
1530
+
static int __maybe_unused omap_i2c_runtime_resume(struct device *dev)
1530
1531
{
1531
1532
struct omap_i2c_dev *omap = dev_get_drvdata(dev);
1532
1533
···
1541
1542
}
1542
1543
1543
1544
static const struct dev_pm_ops omap_i2c_pm_ops = {
1545
+
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
1546
+
pm_runtime_force_resume)
1544
1547
SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,
1545
1548
omap_i2c_runtime_resume, NULL)
1546
1549
};
1547
-
#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
1548
-
#else
1549
-
#define OMAP_I2C_PM_OPS NULL
1550
-
#endif /* CONFIG_PM */
1551
1550
1552
1551
static struct platform_driver omap_i2c_driver = {
1553
1552
.probe = omap_i2c_probe,
1554
1553
.remove = omap_i2c_remove,
1555
1554
.driver = {
1556
1555
.name = "omap_i2c",
1557
-
.pm = OMAP_I2C_PM_OPS,
1556
+
.pm = &omap_i2c_pm_ops,
1558
1557
.of_match_table = of_match_ptr(omap_i2c_of_match),
1559
1558
},
1560
1559
};