Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (03fb3aca) · Commits · 戴 / test

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

MAINTAINERS

+8 −1

Original line number	Diff line number	Diff line
		@@ -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>

drivers/i2c/algos/i2c-algo-pca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");

drivers/i2c/busses/i2c-altera.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/i2c/busses/i2c-at91-master.c

+17 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message