Commit 12df9f37 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:
 "This is probably not the kind of pull request you want to see that
  late in the cycle.  Yet, the ACPI refactorization was problematic
  again and caused another two issues which need fixing.  My holidays
  with limited internet (plus travelling) and the developer's illness
  didn't help either :(

  The details:

   - ACPI code was refactored out into a seperate file and as a
     side-effect, the i2c-core module got renamed.  Jean Delvare
     rightfully complained about the rename being problematic for
     distributions.  So, Mika and I thought the least problematic way to
     deal with it is to move all the code back into the main i2c core
     source file.  This is mainly a huge code move with some #ifdeffery
     applied.  No functional code changes.  Our personal tests and the
     testbots did not find problems.  (I was thinking about reverting,
     too, yet that would also have ~800 lines changed)

   - The new ACPI code also had a NULL pointer exception, thanks to
     Peter for finding and fixing it.

   - Mikko fixed a locking problem by decoupling clock_prepare and
     clock_enable.

   - Addy learnt that the datasheet was wrong and reimplemented the
     frequency setup according to the new algorithm.

  - Fan fixed an off-by-one error when copying data

  - Janusz fixed a copy'n'paste bug which gave a wrong error message

  - Sergei made sure that "don't touch" bits are not accessed"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: acpi: Fix NULL Pointer dereference
  i2c: move acpi code back into the core
  i2c: rk3x: fix divisor calculation for SCL frequency
  i2c: mxs: fix error message in pio transfer
  i2c: ismt: use correct length when copy buffer
  i2c: rcar: fix RCAR_IRQ_ACK_{RECV|SEND}
  i2c: tegra: Move clk_prepare/clk_set_rate to probe
parents d671e424 0aef44e8

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -4476,7 +4476,6 @@ M: Mika Westerberg <mika.westerberg@linux.intel.com> 
L:	linux-i2c@vger.kernel.org

L:	linux-acpi@vger.kernel.org

S:	Maintained

F:	drivers/i2c/i2c-acpi.c



I2C-TAOS-EVM DRIVER

M:	Jean Delvare <jdelvare@suse.de>

drivers/i2c/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -2,11 +2,8 @@ 
# Makefile for the i2c core.

#



i2ccore-y := i2c-core.o

i2ccore-$(CONFIG_ACPI)	 	+= i2c-acpi.o



obj-$(CONFIG_I2C_BOARDINFO)	+= i2c-boardinfo.o

obj-$(CONFIG_I2C)		+= i2ccore.o

obj-$(CONFIG_I2C)		+= i2c-core.o

obj-$(CONFIG_I2C_SMBUS)		+= i2c-smbus.o

obj-$(CONFIG_I2C_CHARDEV)	+= i2c-dev.o

obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o

drivers/i2c/busses/i2c-ismt.c

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 
			desc->wr_len_cmd = dma_size;

			desc->control |= ISMT_DESC_BLK;

			priv->dma_buffer[0] = command;

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size);

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size - 1);

		} else {

			/* Block Read */

			dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA:  READ\n");
@@ -525,7 +525,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, 
			desc->wr_len_cmd = dma_size;

			desc->control |= ISMT_DESC_I2C;

			priv->dma_buffer[0] = command;

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size);

			memcpy(&priv->dma_buffer[1], &data->block[1], dma_size - 1);

		} else {

			/* i2c Block Read */

			dev_dbg(dev, "I2C_SMBUS_I2C_BLOCK_DATA:  READ\n");

drivers/i2c/busses/i2c-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap, 
		ret = mxs_i2c_pio_wait_xfer_end(i2c);

		if (ret) {

			dev_err(i2c->dev,

				"PIO: Failed to send SELECT command!\n");

				"PIO: Failed to send READ command!\n");

			goto cleanup;

		}

drivers/i2c/busses/i2c-rcar.c

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ 
#define RCAR_IRQ_RECV	(MNR | MAL | MST | MAT | MDR)

#define RCAR_IRQ_STOP	(MST)



#define RCAR_IRQ_ACK_SEND	(~(MAT | MDE))

#define RCAR_IRQ_ACK_RECV	(~(MAT | MDR))

#define RCAR_IRQ_ACK_SEND	(~(MAT | MDE) & 0xFF)

#define RCAR_IRQ_ACK_RECV	(~(MAT | MDR) & 0xFF)



#define ID_LAST_MSG	(1 << 0)

#define ID_IOERROR	(1 << 1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE