Commit 74f3f1d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "A documentation fix and driver fixes for piix4, tegra, and i801"

* tag 'i2c-for-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Documentation: devres: add missing I2C helper
  i2c: i801: add lis3lv02d's I2C address for Vostro 5568
  i2c: tegra: Allocate DMA memory for DMA engine
  i2c: piix4: Fix adapter not be removed in piix4_remove()
parents 64c3dd0b 8e987f1f

Documentation/driver-api/driver-model/devres.rst

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ GPIO 
  devm_gpio_request_one()



I2C

  devm_i2c_add_adapter()

  devm_i2c_new_dummy_device()



IIO

drivers/i2c/busses/i2c-i801.c

+1 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,7 @@ static const struct { 
	 */

	{ "Latitude 5480",      0x29 },

	{ "Vostro V131",        0x1d },

	{ "Vostro 5568",        0x29 },

};



static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv)

drivers/i2c/busses/i2c-piix4.c

+1 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) 
					   "", &piix4_main_adapters[0]);

		if (retval < 0)

			return retval;

		piix4_adapter_count = 1;

	}



	/* Check for auxiliary SMBus on some AMD chipsets */

drivers/i2c/busses/i2c-tegra.c

+10 −6
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ struct tegra_i2c_dev { 
	struct dma_chan *tx_dma_chan;

	struct dma_chan *rx_dma_chan;

	unsigned int dma_buf_size;

	struct device *dma_dev;

	dma_addr_t dma_phys;

	void *dma_buf;
@@ -420,7 +421,7 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len) 
static void tegra_i2c_release_dma(struct tegra_i2c_dev *i2c_dev)

{

	if (i2c_dev->dma_buf) {

		dma_free_coherent(i2c_dev->dev, i2c_dev->dma_buf_size,

		dma_free_coherent(i2c_dev->dma_dev, i2c_dev->dma_buf_size,

				  i2c_dev->dma_buf, i2c_dev->dma_phys);

		i2c_dev->dma_buf = NULL;

	}
@@ -472,10 +473,13 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev) 


	i2c_dev->tx_dma_chan = chan;



	WARN_ON(i2c_dev->tx_dma_chan->device != i2c_dev->rx_dma_chan->device);

	i2c_dev->dma_dev = chan->device->dev;



	i2c_dev->dma_buf_size = i2c_dev->hw->quirks->max_write_len +

				I2C_PACKET_HEADER_SIZE;



	dma_buf = dma_alloc_coherent(i2c_dev->dev, i2c_dev->dma_buf_size,

	dma_buf = dma_alloc_coherent(i2c_dev->dma_dev, i2c_dev->dma_buf_size,

				     &dma_phys, GFP_KERNEL | __GFP_NOWARN);

	if (!dma_buf) {

		dev_err(i2c_dev->dev, "failed to allocate DMA buffer\n");
@@ -1272,7 +1276,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, 


	if (i2c_dev->dma_mode) {

		if (i2c_dev->msg_read) {

			dma_sync_single_for_device(i2c_dev->dev,

			dma_sync_single_for_device(i2c_dev->dma_dev,

						   i2c_dev->dma_phys,

						   xfer_size, DMA_FROM_DEVICE);
@@ -1280,7 +1284,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, 
			if (err)

				return err;

		} else {

			dma_sync_single_for_cpu(i2c_dev->dev,

			dma_sync_single_for_cpu(i2c_dev->dma_dev,

						i2c_dev->dma_phys,

						xfer_size, DMA_TO_DEVICE);

		}
@@ -1293,7 +1297,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, 
			memcpy(i2c_dev->dma_buf + I2C_PACKET_HEADER_SIZE,

			       msg->buf, msg->len);



			dma_sync_single_for_device(i2c_dev->dev,

			dma_sync_single_for_device(i2c_dev->dma_dev,

						   i2c_dev->dma_phys,

						   xfer_size, DMA_TO_DEVICE);
@@ -1344,7 +1348,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, 
		}



		if (i2c_dev->msg_read && i2c_dev->msg_err == I2C_ERR_NONE) {

			dma_sync_single_for_cpu(i2c_dev->dev,

			dma_sync_single_for_cpu(i2c_dev->dma_dev,

						i2c_dev->dma_phys,

						xfer_size, DMA_FROM_DEVICE);