Commit d7d3d841 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:
 "A set of 'usual' driver bugfixes for the I2C subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rcar: disable runtime PM correctly in slave mode
  i2c: designware: Keep pm_runtime_enable/_disable calls in sync
  i2c: designware: fix IO timeout issue for AMD controller
  i2c: imx: init bus recovery info before adding i2c adapter
  i2c: do not use 0x in front of %pa
  i2c: davinci: Increase module clock frequency
  i2c: mv64xxx: The n clockdiv factor is 0 based on sunxi SoCs
  i2c: rk3x: populate correct variable for sda_falling_time
parents 632f8577 b4cd08aa

drivers/i2c/busses/i2c-davinci.c

+9 −2
Original line number Diff line number Diff line
@@ -202,8 +202,15 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev) 
	 * d is always 6 on Keystone I2C controller

	 */



	/* get minimum of 7 MHz clock, but max of 12 MHz */

	psc = (input_clock / 7000000) - 1;

	/*

	 * Both Davinci and current Keystone User Guides recommend a value

	 * between 7MHz and 12MHz. In reality 7MHz module clock doesn't

	 * always produce enough margin between SDA and SCL transitions.

	 * Measurements show that the higher the module clock is, the

	 * bigger is the margin, providing more reliable communication.

	 * So we better target for 12MHz.

	 */

	psc = (input_clock / 12000000) - 1;

	if ((input_clock / (psc + 1)) > 12000000)

		psc++;	/* better to run under spec than over */

	d = (psc >= 2) ? 5 : 7 - psc;

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

+6 −0
Original line number Diff line number Diff line
@@ -813,6 +813,12 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id) 
tx_aborted:

	if ((stat & (DW_IC_INTR_TX_ABRT | DW_IC_INTR_STOP_DET)) || dev->msg_err)

		complete(&dev->cmd_complete);

	else if (unlikely(dev->accessor_flags & ACCESS_INTR_MASK)) {

		/* workaround to trigger pending interrupt */

		stat = dw_readl(dev, DW_IC_INTR_MASK);

		i2c_dw_disable_int(dev);

		dw_writel(dev, stat, DW_IC_INTR_MASK);

	}



	return IRQ_HANDLED;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct dw_i2c_dev { 


#define ACCESS_SWAP		0x00000001

#define ACCESS_16BIT		0x00000002

#define ACCESS_INTR_MASK	0x00000004



extern int i2c_dw_init(struct dw_i2c_dev *dev);

extern void i2c_dw_disable(struct dw_i2c_dev *dev);

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

+10 −6
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[], 
static int dw_i2c_acpi_configure(struct platform_device *pdev)

{

	struct dw_i2c_dev *dev = platform_get_drvdata(pdev);

	const struct acpi_device_id *id;



	dev->adapter.nr = -1;

	dev->tx_fifo_depth = 32;
@@ -106,6 +107,10 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) 
	dw_i2c_acpi_params(pdev, "FMCN", &dev->fs_hcnt, &dev->fs_lcnt,

			   &dev->sda_hold_time);



	id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);

	if (id && id->driver_data)

		dev->accessor_flags |= (u32)id->driver_data;



	return 0;

}
@@ -116,7 +121,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { 
	{ "INT3433", 0 },

	{ "80860F41", 0 },

	{ "808622C1", 0 },

	{ "AMD0010", 0 },

	{ "AMD0010", ACCESS_INTR_MASK },

	{ }

};

MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
@@ -240,12 +245,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
	}



	r = i2c_dw_probe(dev);

	if (r) {

	if (r && !dev->pm_runtime_disabled)

		pm_runtime_disable(&pdev->dev);

		return r;

	}



	return 0;

	return r;

}



static int dw_i2c_plat_remove(struct platform_device *pdev)
@@ -260,6 +263,7 @@ static int dw_i2c_plat_remove(struct platform_device *pdev) 


	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_put_sync(&pdev->dev);

	if (!dev->pm_runtime_disabled)

		pm_runtime_disable(&pdev->dev);



	return 0;

drivers/i2c/busses/i2c-imx.c

+2 −2
Original line number Diff line number Diff line
@@ -1119,6 +1119,8 @@ static int i2c_imx_probe(struct platform_device *pdev) 
			i2c_imx, IMX_I2C_I2CR);

	imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);



	i2c_imx_init_recovery_info(i2c_imx, pdev);



	/* Add I2C adapter */

	ret = i2c_add_numbered_adapter(&i2c_imx->adapter);

	if (ret < 0) {
@@ -1126,8 +1128,6 @@ static int i2c_imx_probe(struct platform_device *pdev) 
		goto clk_disable;

	}



	i2c_imx_init_recovery_info(i2c_imx, pdev);



	/* Set up platform driver data */

	platform_set_drvdata(pdev, i2c_imx);

	clk_disable_unprepare(i2c_imx->clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE