Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 057d5e98 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 driver bugfixes for the I2C subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: ismt: initialize DMA buffer
  i2c: designware: 10-bit addressing mode enabling if I2C_DYNAMIC_TAR_UPDATE is set
  i2c: mv64xxx: Do not use writel_relaxed()
  i2c: mv64xxx: Fix some build warnings
  i2c: s3c2410: fix clk_disable/clk_unprepare WARNings
parents ec220be7 bf416910

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

+20 −6
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 


#define DW_IC_ERR_TX_ABRT	0x1



#define DW_IC_TAR_10BITADDR_MASTER BIT(12)



/*

 * status codes

 */
@@ -388,22 +390,34 @@ static int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev) 
static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)

{

	struct i2c_msg *msgs = dev->msgs;

	u32 ic_con;

	u32 ic_con, ic_tar = 0;



	/* Disable the adapter */

	__i2c_dw_enable(dev, false);



	/* set the slave (target) address */

	dw_writel(dev, msgs[dev->msg_write_idx].addr, DW_IC_TAR);



	/* if the slave address is ten bit address, enable 10BITADDR */

	ic_con = dw_readl(dev, DW_IC_CON);

	if (msgs[dev->msg_write_idx].flags & I2C_M_TEN)

	if (msgs[dev->msg_write_idx].flags & I2C_M_TEN) {

		ic_con |= DW_IC_CON_10BITADDR_MASTER;

	else

		/*

		 * If I2C_DYNAMIC_TAR_UPDATE is set, the 10-bit addressing

		 * mode has to be enabled via bit 12 of IC_TAR register.

		 * We set it always as I2C_DYNAMIC_TAR_UPDATE can't be

		 * detected from registers.

		 */

		ic_tar = DW_IC_TAR_10BITADDR_MASTER;

	} else {

		ic_con &= ~DW_IC_CON_10BITADDR_MASTER;

	}



	dw_writel(dev, ic_con, DW_IC_CON);



	/*

	 * Set the slave (target) address and enable 10-bit addressing mode

	 * if applicable.

	 */

	dw_writel(dev, msgs[dev->msg_write_idx].addr | ic_tar, DW_IC_TAR);



	/* Enable the adapter */

	__i2c_dw_enable(dev, true);

drivers/i2c/busses/i2c-ismt.c

+3 −0
Original line number Diff line number Diff line
@@ -393,6 +393,9 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 


	desc = &priv->hw[priv->head];



	/* Initialize the DMA buffer */

	memset(priv->dma_buffer, 0, sizeof(priv->dma_buffer));



	/* Initialize the descriptor */

	memset(desc, 0, sizeof(struct ismt_desc));

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

drivers/i2c/busses/i2c-mv64xxx.c

+9 −7
Original line number Diff line number Diff line
@@ -234,9 +234,9 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data) 
		ctrl_reg |= MV64XXX_I2C_BRIDGE_CONTROL_WR |

		    (msg->len - 1) << MV64XXX_I2C_BRIDGE_CONTROL_TX_SIZE_SHIFT;



		writel_relaxed(data_reg_lo,

		writel(data_reg_lo,

			drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_LO);

		writel_relaxed(data_reg_hi,

		writel(data_reg_hi,

			drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_HI);



	} else {
@@ -697,6 +697,7 @@ static const struct of_device_id mv64xxx_i2c_of_match_table[] = { 
MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);



#ifdef CONFIG_OF

#ifdef CONFIG_HAVE_CLK

static int

mv64xxx_calc_freq(const int tclk, const int n, const int m)

{
@@ -726,16 +727,12 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n, 
		return false;

	return true;

}

#endif /* CONFIG_HAVE_CLK */



static int

mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,

		  struct device *dev)

{

	const struct of_device_id *device;

	struct device_node *np = dev->of_node;

	u32 bus_freq, tclk;

	int rc = 0;



	/* CLK is mandatory when using DT to describe the i2c bus. We

	 * need to know tclk in order to calculate bus clock

	 * factors.
@@ -744,6 +741,11 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, 
	/* Have OF but no CLK */

	return -ENODEV;

#else

	const struct of_device_id *device;

	struct device_node *np = dev->of_node;

	u32 bus_freq, tclk;

	int rc = 0;



	if (IS_ERR(drv_data->clk)) {

		rc = -ENODEV;

		goto out;

drivers/i2c/busses/i2c-s3c2410.c

+0 −2
Original line number Diff line number Diff line
@@ -1178,8 +1178,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) 


	i2c_del_adapter(&i2c->adap);



	clk_disable_unprepare(i2c->clk);



	if (pdev->dev.of_node && IS_ERR(i2c->pctrl))

		s3c24xx_i2c_dt_gpio_free(i2c);