Commit 67ec505f authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-fixes-6.8-rc5' of... 

Merge tag 'i2c-host-fixes-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current

Three fixes are included here. Two are strictly hardware-related
for the i801 and qcom-geni devices. Meanwhile, a fix from Arnd
addresses a compilation error encountered during compile test on
powerpc.
parents 841c3516 c1c9d0f6

drivers/i2c/busses/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -90,10 +90,8 @@ obj-$(CONFIG_I2C_NPCM) += i2c-npcm7xx.o 
obj-$(CONFIG_I2C_OCORES)	+= i2c-ocores.o

obj-$(CONFIG_I2C_OMAP)		+= i2c-omap.o

obj-$(CONFIG_I2C_OWL)		+= i2c-owl.o

i2c-pasemi-objs := i2c-pasemi-core.o i2c-pasemi-pci.o

obj-$(CONFIG_I2C_PASEMI)	+= i2c-pasemi.o

i2c-apple-objs := i2c-pasemi-core.o i2c-pasemi-platform.o

obj-$(CONFIG_I2C_APPLE)	+= i2c-apple.o

obj-$(CONFIG_I2C_PASEMI)	+= i2c-pasemi-core.o i2c-pasemi-pci.o

obj-$(CONFIG_I2C_APPLE)		+= i2c-pasemi-core.o i2c-pasemi-platform.o

obj-$(CONFIG_I2C_PCA_PLATFORM)	+= i2c-pca-platform.o

obj-$(CONFIG_I2C_PNX)		+= i2c-pnx.o

obj-$(CONFIG_I2C_PXA)		+= i2c-pxa.o

drivers/i2c/busses/i2c-i801.c

+2 −2
Original line number Diff line number Diff line
@@ -498,11 +498,10 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, 
	/* Set block buffer mode */

	outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));



	inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */



	if (read_write == I2C_SMBUS_WRITE) {

		len = data->block[0];

		outb_p(len, SMBHSTDAT0(priv));

		inb_p(SMBHSTCNT(priv));	/* reset the data buffer index */

		for (i = 0; i < len; i++)

			outb_p(data->block[i+1], SMBBLKDAT(priv));

	}
@@ -520,6 +519,7 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, 
		}



		data->block[0] = len;

		inb_p(SMBHSTCNT(priv));	/* reset the data buffer index */

		for (i = 0; i < len; i++)

			data->block[i + 1] = inb_p(SMBBLKDAT(priv));

	}

drivers/i2c/busses/i2c-pasemi-core.c

+6 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ int pasemi_i2c_common_probe(struct pasemi_smbus *smbus) 


	return 0;

}

EXPORT_SYMBOL_GPL(pasemi_i2c_common_probe);



irqreturn_t pasemi_irq_handler(int irq, void *dev_id)

{
@@ -378,3 +379,8 @@ irqreturn_t pasemi_irq_handler(int irq, void *dev_id) 
	complete(&smbus->irq_completion);

	return IRQ_HANDLED;

}

EXPORT_SYMBOL_GPL(pasemi_irq_handler);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");

MODULE_DESCRIPTION("PA Semi PWRficient SMBus driver");

drivers/i2c/busses/i2c-qcom-geni.c

+7 −7
Original line number Diff line number Diff line
@@ -613,20 +613,20 @@ static int geni_i2c_gpi_xfer(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], i 


		peripheral.addr = msgs[i].addr;



		if (msgs[i].flags & I2C_M_RD) {

		ret =  geni_i2c_gpi(gi2c, &msgs[i], &config,

					    &rx_addr, &rx_buf, I2C_READ, gi2c->rx_c);

				    &tx_addr, &tx_buf, I2C_WRITE, gi2c->tx_c);

		if (ret)

			goto err;

		}



		if (msgs[i].flags & I2C_M_RD) {

			ret =  geni_i2c_gpi(gi2c, &msgs[i], &config,

				    &tx_addr, &tx_buf, I2C_WRITE, gi2c->tx_c);

					    &rx_addr, &rx_buf, I2C_READ, gi2c->rx_c);

			if (ret)

				goto err;



		if (msgs[i].flags & I2C_M_RD)

			dma_async_issue_pending(gi2c->rx_c);

		}



		dma_async_issue_pending(gi2c->tx_c);



		timeout = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT);