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
This commit is contained in:
commit
03fb3acae4
2
.mailmap
2
.mailmap
|
@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
|
|||
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
|
||||
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
|
||||
Will Deacon <will@kernel.org> <will.deacon@arm.com>
|
||||
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
|
||||
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
|
||||
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
|
||||
Yusuke Goda <goda.yusuke@renesas.com>
|
||||
Gustavo Padovan <gustavo@las.ic.unicamp.br>
|
||||
|
|
|
@ -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: linux-i2c@vger.kernel.org
|
||||
S: Maintained
|
||||
W: https://i2c.wiki.kernel.org/
|
||||
|
@ -10662,6 +10662,13 @@ L: netdev@vger.kernel.org
|
|||
S: Maintained
|
||||
F: drivers/net/ethernet/mediatek/
|
||||
|
||||
MEDIATEK I2C CONTROLLER DRIVER
|
||||
M: Qii Wang <qii.wang@mediatek.com>
|
||||
L: linux-i2c@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
|
||||
F: drivers/i2c/busses/i2c-mt65xx.c
|
||||
|
||||
MEDIATEK JPEG DRIVER
|
||||
M: Rick Chang <rick.chang@mediatek.com>
|
||||
M: Bin Liu <bin.liu@mediatek.com>
|
||||
|
|
|
@ -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 <icampbell@arcom.com>, "
|
||||
"Wolfram Sang <w.sang@pengutronix.de>");
|
||||
"Wolfram Sang <kernel@pengutronix.de>");
|
||||
MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
* @isr_mask: cached copy of local ISR enables.
|
||||
* @isr_status: cached copy of local ISR status.
|
||||
* @lock: spinlock for IRQ synchronization.
|
||||
* @isr_mutex: mutex for IRQ thread.
|
||||
*/
|
||||
struct altr_i2c_dev {
|
||||
void __iomem *base;
|
||||
|
@ -86,6 +87,7 @@ struct altr_i2c_dev {
|
|||
u32 isr_mask;
|
||||
u32 isr_status;
|
||||
spinlock_t lock; /* IRQ synchronization */
|
||||
struct mutex isr_mutex;
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -245,10 +247,11 @@ static irqreturn_t altr_i2c_isr(int irq, void *_dev)
|
|||
struct altr_i2c_dev *idev = _dev;
|
||||
u32 status = idev->isr_status;
|
||||
|
||||
mutex_lock(&idev->isr_mutex);
|
||||
if (!idev->msg) {
|
||||
dev_warn(idev->dev, "unexpected interrupt\n");
|
||||
altr_i2c_int_clear(idev, ALTR_I2C_ALL_IRQ);
|
||||
return IRQ_HANDLED;
|
||||
goto out;
|
||||
}
|
||||
read = (idev->msg->flags & I2C_M_RD) != 0;
|
||||
|
||||
|
@ -301,6 +304,8 @@ static irqreturn_t altr_i2c_isr(int irq, void *_dev)
|
|||
complete(&idev->msg_complete);
|
||||
dev_dbg(idev->dev, "Message Complete\n");
|
||||
}
|
||||
out:
|
||||
mutex_unlock(&idev->isr_mutex);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
@ -312,6 +317,7 @@ static int altr_i2c_xfer_msg(struct altr_i2c_dev *idev, struct i2c_msg *msg)
|
|||
u32 value;
|
||||
u8 addr = i2c_8bit_addr_from_msg(msg);
|
||||
|
||||
mutex_lock(&idev->isr_mutex);
|
||||
idev->msg = msg;
|
||||
idev->msg_len = msg->len;
|
||||
idev->buf = msg->buf;
|
||||
|
@ -336,6 +342,7 @@ static int altr_i2c_xfer_msg(struct altr_i2c_dev *idev, struct i2c_msg *msg)
|
|||
altr_i2c_int_enable(idev, imask, true);
|
||||
altr_i2c_fill_tx_fifo(idev);
|
||||
}
|
||||
mutex_unlock(&idev->isr_mutex);
|
||||
|
||||
time_left = wait_for_completion_timeout(&idev->msg_complete,
|
||||
ALTR_I2C_XFER_TIMEOUT);
|
||||
|
@ -409,6 +416,7 @@ static int altr_i2c_probe(struct platform_device *pdev)
|
|||
idev->dev = &pdev->dev;
|
||||
init_completion(&idev->msg_complete);
|
||||
spin_lock_init(&idev->lock);
|
||||
mutex_init(&idev->isr_mutex);
|
||||
|
||||
ret = device_property_read_u32(idev->dev, "fifo-size",
|
||||
&idev->fifo_size);
|
||||
|
|
|
@ -845,6 +845,18 @@ static int at91_init_twi_recovery_info(struct platform_device *pdev,
|
|||
PINCTRL_STATE_DEFAULT);
|
||||
dev->pinctrl_pins_gpio = pinctrl_lookup_state(dev->pinctrl,
|
||||
"gpio");
|
||||
if (IS_ERR(dev->pinctrl_pins_default) ||
|
||||
IS_ERR(dev->pinctrl_pins_gpio)) {
|
||||
dev_info(&pdev->dev, "pinctrl states incomplete for recovery\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/*
|
||||
* pins will be taken as GPIO, so we might as well inform pinctrl about
|
||||
* this and move the state to GPIO
|
||||
*/
|
||||
pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_gpio);
|
||||
|
||||
rinfo->sda_gpiod = devm_gpiod_get(&pdev->dev, "sda", GPIOD_IN);
|
||||
if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
|
@ -855,9 +867,7 @@ static int at91_init_twi_recovery_info(struct platform_device *pdev,
|
|||
return -EPROBE_DEFER;
|
||||
|
||||
if (IS_ERR(rinfo->sda_gpiod) ||
|
||||
IS_ERR(rinfo->scl_gpiod) ||
|
||||
IS_ERR(dev->pinctrl_pins_default) ||
|
||||
IS_ERR(dev->pinctrl_pins_gpio)) {
|
||||
IS_ERR(rinfo->scl_gpiod)) {
|
||||
dev_info(&pdev->dev, "recovery information incomplete\n");
|
||||
if (!IS_ERR(rinfo->sda_gpiod)) {
|
||||
gpiod_put(rinfo->sda_gpiod);
|
||||
|
@ -867,9 +877,13 @@ static int at91_init_twi_recovery_info(struct platform_device *pdev,
|
|||
gpiod_put(rinfo->scl_gpiod);
|
||||
rinfo->scl_gpiod = NULL;
|
||||
}
|
||||
pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_default);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* change the state of the pins back to their default state */
|
||||
pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_default);
|
||||
|
||||
dev_info(&pdev->dev, "using scl, sda for recovery\n");
|
||||
|
||||
rinfo->prepare_recovery = at91_prepare_twi_recovery;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* Mux support by Rodolfo Giometti <giometti@enneenne.com> and
|
||||
* Michael Lawnick <michael.lawnick.ext@nsn.com>
|
||||
*
|
||||
* 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 @@ err_detach_pm_domain:
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>
|
||||
* based on a previous patch from Jon Smirl <jonsmirl@gmail.com>
|
||||
*
|
||||
* 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>
|
||||
|
|
|
@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
|
|||
err_rollback_available:
|
||||
device_remove_file(&pdev->dev, &dev_attr_available_masters);
|
||||
err_rollback:
|
||||
i2c_demux_deactivate_master(priv);
|
||||
for (j = 0; j < i; j++) {
|
||||
of_node_put(priv->chan[j].parent_np);
|
||||
of_changeset_destroy(&priv->chan[j].chgset);
|
||||
|
|
|
@ -29,7 +29,7 @@ struct i2c_mux_core {
|
|||
|
||||
int num_adapters;
|
||||
int max_adapters;
|
||||
struct i2c_adapter *adapter[0];
|
||||
struct i2c_adapter *adapter[];
|
||||
};
|
||||
|
||||
struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
|
||||
|
|
|
@ -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 <kmalkki@cc.hut.fi> and
|
||||
* Frodo Looijaard <frodol@dds.nl>
|
||||
|
|
Loading…
Reference in New Issue