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

Commit 9e6bdaaa 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: mv64xxx: Document the newly introduced allwinner compatible
  i2c: Fix Kontron PLD prescaler calculation
  i2c: i2c-mxs: Use DMA mode even for small transfers
parents d92581fc f480adaf

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
Required properties :



 - reg             : Offset and length of the register set for the device

 - compatible      : Should be "marvell,mv64xxx-i2c"

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

 - interrupts      : The interrupt number



Optional properties :

drivers/i2c/busses/i2c-kempld.c

+2 −2
Original line number Diff line number Diff line
@@ -246,9 +246,9 @@ static void kempld_i2c_device_init(struct kempld_i2c_data *i2c) 
		bus_frequency = KEMPLD_I2C_FREQ_MAX;



	if (pld->info.spec_major == 1)

		prescale = pld->pld_clock / bus_frequency * 5 - 1000;

		prescale = pld->pld_clock / (bus_frequency * 5) - 1000;

	else

		prescale = pld->pld_clock / bus_frequency * 4 - 3000;

		prescale = pld->pld_clock / (bus_frequency * 4) - 3000;



	if (prescale < 0)

		prescale = 0;

drivers/i2c/busses/i2c-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, 
	 * based on this empirical measurement and a lot of previous frobbing.

	 */

	i2c->cmd_err = 0;

	if (msg->len < 8) {

	if (0) {	/* disable PIO mode until a proper fix is made */

		ret = mxs_i2c_pio_setup_xfer(adap, msg, flags);

		if (ret)

			mxs_i2c_reset(i2c);