Commit 978df3e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Some I2C driver bugfixes for 5.18. Nothing spectacular but worth
  fixing"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  drivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllers
  i2c: ismt: Provide a DMA buffer for Interrupt Cause Logging
  i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
parents eaea45fc 03a35bc8

drivers/i2c/busses/i2c-ismt.c

+14 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 


#define ISMT_DESC_ENTRIES	2	/* number of descriptor entries */

#define ISMT_MAX_RETRIES	3	/* number of SMBus retries to attempt */

#define ISMT_LOG_ENTRIES	3	/* number of interrupt cause log entries */



/* Hardware Descriptor Constants - Control Field */

#define ISMT_DESC_CWRL	0x01	/* Command/Write Length */
@@ -175,6 +176,8 @@ struct ismt_priv { 
	u8 head;				/* ring buffer head pointer */

	struct completion cmp;			/* interrupt completion */

	u8 buffer[I2C_SMBUS_BLOCK_MAX + 16];	/* temp R/W data buffer */

	dma_addr_t log_dma;

	u32 *log;

};



static const struct pci_device_id ismt_ids[] = {
@@ -411,6 +414,9 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 
	memset(desc, 0, sizeof(struct ismt_desc));

	desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write);



	/* Always clear the log entries */

	memset(priv->log, 0, ISMT_LOG_ENTRIES * sizeof(u32));



	/* Initialize common control bits */

	if (likely(pci_dev_msi_enabled(priv->pci_dev)))

		desc->control = ISMT_DESC_INT | ISMT_DESC_FAIR;
@@ -708,6 +714,8 @@ static void ismt_hw_init(struct ismt_priv *priv) 
	/* initialize the Master Descriptor Base Address (MDBA) */

	writeq(priv->io_rng_dma, priv->smba + ISMT_MSTR_MDBA);



	writeq(priv->log_dma, priv->smba + ISMT_GR_SMTICL);



	/* initialize the Master Control Register (MCTRL) */

	writel(ISMT_MCTRL_MEIE, priv->smba + ISMT_MSTR_MCTRL);
@@ -795,6 +803,12 @@ static int ismt_dev_init(struct ismt_priv *priv) 
	priv->head = 0;

	init_completion(&priv->cmp);



	priv->log = dmam_alloc_coherent(&priv->pci_dev->dev,

					ISMT_LOG_ENTRIES * sizeof(u32),

					&priv->log_dma, GFP_KERNEL);

	if (!priv->log)

		return -ENOMEM;



	return 0;

}

drivers/i2c/busses/i2c-mt7621.c

+8 −2
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device *pdev) 


	if (i2c->bus_freq == 0) {

		dev_warn(i2c->dev, "clock-frequency 0 not supported\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_disable_clk;

	}



	adap = &i2c->adap;
@@ -322,10 +323,15 @@ static int mtk_i2c_probe(struct platform_device *pdev) 


	ret = i2c_add_adapter(adap);

	if (ret < 0)

		return ret;

		goto err_disable_clk;



	dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);



	return 0;



err_disable_clk:

	clk_disable_unprepare(i2c->clk);



	return ret;

}

drivers/i2c/busses/i2c-thunderx-pcidrv.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, 
	i2c->adap.bus_recovery_info = &octeon_i2c_recovery_info;

	i2c->adap.dev.parent = dev;

	i2c->adap.dev.of_node = pdev->dev.of_node;

	i2c->adap.dev.fwnode = dev->fwnode;

	snprintf(i2c->adap.name, sizeof(i2c->adap.name),

		 "Cavium ThunderX i2c adapter at %s", dev_name(dev));

	i2c_set_adapdata(&i2c->adap, i2c);