linux.git/drivers/i2c, branch v3.3-rc5

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes

2012-02-13T05:40:38+00:00

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
  ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
  ARM: tegra: paz00: fix wrong SD1 power gpio
  i2c: tegra: Add devexit_p() for remove
  ARM: tegra: dma: fix buildbreak for !CONFIG_TEGRA_SYSTEM_DMA

i2c: tegra: Add devexit_p() for remove

2012-02-07T02:32:45+00:00

It was originally missed in the __devinit/__devexit annotations.

Signed-off-by: Shubhrajyoti D 
Acked-by: Stephen Warren 
Acked-by: Ben Dooks 
Signed-off-by: Olof Johansson

i2c: OMAP: Fix OMAP1 build error

2012-01-20T16:24:22+00:00

CONFIG_OF is not defined for OMAP1 yet and thus the omap1_defconfig build
generate an error for 3.3-rc1.

drivers/i2c/busses/i2c-omap.c: In function 'omap_i2c_probe':
drivers/i2c/busses/i2c-omap.c:1021:26: error: 'omap_i2c_of_match' undeclared (first use in this function)
drivers/i2c/busses/i2c-omap.c:1021:26: note: each undeclared identifier is reported only once for each function it appears in

Wrap omap_i2c_of_match with of_match_ptr() to prevent compilation error in case of OMAP1 build.

Signed-off-by: Benoit Cousson 
Cc: Ben Dooks 
Signed-off-by: Tony Lindgren

Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33

2012-01-17T23:30:41+00:00

i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor

2012-01-17T23:29:56+00:00

On October 1 in 2011,
OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor Co., Ltd.

Signed-off-by: Tomoya MORINAGA 
Signed-off-by: Ben Dooks

i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH

2012-01-17T23:29:52+00:00

ML7831 is companion chip for Intel Atom E6xx series.

Signed-off-by: Tomoya MORINAGA 
Signed-off-by: Ben Dooks

i2c-eg20t: modified the setting of transfer rate.

2012-01-17T23:28:18+00:00

This patch modified the setting value of
I2C Bus Transfer Rate Setting Counter regisrer.

Signed-off-by: Toshiharu Okada 
Signed-off-by: Ben Dooks

i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number

2012-01-17T23:24:37+00:00

For EG20T and ML7213 IOH, the i2c controller numbers are fixed, using
fixed bus number will make it much easier for platform code to use
i2c_register_board_info() to register i2c devices.

Signed-off-by: Feng Tang 
Signed-off-by: Ben Dooks

i2c: OMAP: Add DT support for i2c controller

2012-01-17T22:44:57+00:00

Add initial DT support to retrieve the frequency using a
DT attribute instead of the pdata pointer if of_node exist.

Add documentation for omap i2c controller binding.

Based on original patches from Manju and Grant.

Signed-off-by: Benoit Cousson 
Cc: Ben Dooks 
Reviewed-by: Rob Herring 
Acked-by: Grant Likely 
Signed-off-by: Kevin Hilman

I2C: OMAP: NACK without STP

2012-01-17T22:44:54+00:00

On OMAP4 OMAP_I2C_STAT_NACK is causing a timeout on the next access.
The isr cleans all flags in OMAP_I2C_CON_REG by setting OMAP_I2C_CON_STP
OMAP_I2C_CON_STP is also set in omap_i2c_xfer_msg on the last message.

According to the TI TSR the sequence for OMAP_I2C_STAT_NACK and
OMAP_I2C_STAT_AL are nearly the same.
Removing the OMAP_I2C_CON_STP part in the isr fix the problem.
Tested on OMAP4430 and OMAP3530 (here NACK was not a problem)
Fixes also booting on 2430sdp.

Signed-off-by: Jan Weitzel 
Acked-by: Tony Lindgren 
Signed-off-by: Kevin Hilman