forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "A set of driver and core fixes as well as MAINTAINER update" * 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: add maintainer for mediatek i2c controller driver i2c: mux: Replace zero-length array with flexible-array i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' i2c: altera: Fix race between xfer_msg and isr thread i2c: algo-pca: update contact email i2c: at91: Fix pinmux after devm_gpiod_get() for bus recovery i2c: use my kernel.org address from now on i2c: fix missing pm_runtime_put_sync in i2c_device_probe
- Loading branch information
Showing
10 changed files
with
58 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -288,6 +288,8 @@ Vladimir Davydov <[email protected]> <[email protected]> | |
Vladimir Davydov <[email protected]> <[email protected]> | ||
Takashi YOSHII <[email protected]> | ||
Will Deacon <[email protected]> <[email protected]> | ||
Wolfram Sang <[email protected]> <[email protected]> | ||
Wolfram Sang <[email protected]> <[email protected]> | ||
Yakir Yang <[email protected]> <[email protected]> | ||
Yusuke Goda <[email protected]> | ||
Gustavo Padovan <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7941,7 +7941,7 @@ F: Documentation/i2c/busses/i2c-parport.rst | |
F: drivers/i2c/busses/i2c-parport.c | ||
|
||
I2C SUBSYSTEM | ||
M: Wolfram Sang <wsa@the-dreams.de> | ||
M: Wolfram Sang <wsa@kernel.org> | ||
L: [email protected] | ||
S: Maintained | ||
W: https://i2c.wiki.kernel.org/ | ||
|
@@ -10662,6 +10662,13 @@ L: [email protected] | |
S: Maintained | ||
F: drivers/net/ethernet/mediatek/ | ||
|
||
MEDIATEK I2C CONTROLLER DRIVER | ||
M: Qii Wang <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt | ||
F: drivers/i2c/busses/i2c-mt65xx.c | ||
|
||
MEDIATEK JPEG DRIVER | ||
M: Rick Chang <[email protected]> | ||
M: Bin Liu <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -542,7 +542,7 @@ int i2c_pca_add_numbered_bus(struct i2c_adapter *adap) | |
EXPORT_SYMBOL(i2c_pca_add_numbered_bus); | ||
|
||
MODULE_AUTHOR("Ian Campbell <[email protected]>, " | ||
"Wolfram Sang <w.sang@pengutronix.de>"); | ||
"Wolfram Sang <kernel@pengutronix.de>"); | ||
MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm"); | ||
MODULE_LICENSE("GPL"); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
* Mux support by Rodolfo Giometti <[email protected]> and | ||
* Michael Lawnick <[email protected]> | ||
* | ||
* Copyright (C) 2013-2017 Wolfram Sang <wsa@the-dreams.de> | ||
* Copyright (C) 2013-2017 Wolfram Sang <wsa@kernel.org> | ||
*/ | ||
|
||
#define pr_fmt(fmt) "i2c-core: " fmt | ||
|
@@ -338,8 +338,10 @@ static int i2c_device_probe(struct device *dev) | |
} else if (ACPI_COMPANION(dev)) { | ||
irq = i2c_acpi_get_irq(client); | ||
} | ||
if (irq == -EPROBE_DEFER) | ||
return irq; | ||
if (irq == -EPROBE_DEFER) { | ||
status = irq; | ||
goto put_sync_adapter; | ||
} | ||
|
||
if (irq < 0) | ||
irq = 0; | ||
|
@@ -353,15 +355,19 @@ static int i2c_device_probe(struct device *dev) | |
*/ | ||
if (!driver->id_table && | ||
!i2c_acpi_match_device(dev->driver->acpi_match_table, client) && | ||
!i2c_of_match_device(dev->driver->of_match_table, client)) | ||
return -ENODEV; | ||
!i2c_of_match_device(dev->driver->of_match_table, client)) { | ||
status = -ENODEV; | ||
goto put_sync_adapter; | ||
} | ||
|
||
if (client->flags & I2C_CLIENT_WAKE) { | ||
int wakeirq; | ||
|
||
wakeirq = of_irq_get_byname(dev->of_node, "wakeup"); | ||
if (wakeirq == -EPROBE_DEFER) | ||
return wakeirq; | ||
if (wakeirq == -EPROBE_DEFER) { | ||
status = wakeirq; | ||
goto put_sync_adapter; | ||
} | ||
|
||
device_init_wakeup(&client->dev, true); | ||
|
||
|
@@ -408,6 +414,10 @@ static int i2c_device_probe(struct device *dev) | |
err_clear_wakeup_irq: | ||
dev_pm_clear_wake_irq(&client->dev); | ||
device_init_wakeup(&client->dev, false); | ||
put_sync_adapter: | ||
if (client->flags & I2C_CLIENT_HOST_NOTIFY) | ||
pm_runtime_put_sync(&client->adapter->dev); | ||
|
||
return status; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
* Copyright (C) 2008 Jochen Friedrich <[email protected]> | ||
* based on a previous patch from Jon Smirl <[email protected]> | ||
* | ||
* Copyright (C) 2013, 2018 Wolfram Sang <wsa@the-dreams.de> | ||
* Copyright (C) 2013, 2018 Wolfram Sang <wsa@kernel.org> | ||
*/ | ||
|
||
#include <dt-bindings/i2c/i2c.h> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/* | ||
* i2c.h - definitions for the Linux i2c bus interface | ||
* Copyright (C) 1995-2000 Simon G. Vogl | ||
* Copyright (C) 2013-2019 Wolfram Sang <wsa@the-dreams.de> | ||
* Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org> | ||
* | ||
* With some changes from Kyösti Mälkki <[email protected]> and | ||
* Frodo Looijaard <[email protected]> | ||
|