diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-07-24 14:13:59 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2012-07-24 14:13:59 +0200 |
| commit | d47726c52122d64253ae56e0fafdb7d0b954e97c (patch) | |
| tree | def321285e0ef7f45772348fe7054942abfc81c8 /drivers | |
| parent | 68a7602f098c30cc27fbc336db575af63f1be07b (diff) | |
| download | kernel_goldelico_gta04-d47726c52122d64253ae56e0fafdb7d0b954e97c.zip kernel_goldelico_gta04-d47726c52122d64253ae56e0fafdb7d0b954e97c.tar.gz kernel_goldelico_gta04-d47726c52122d64253ae56e0fafdb7d0b954e97c.tar.bz2 | |
i2c: Add SCCB support
SCCB is a serial communication bus developed by Omnivision. Its 2-wire
mode is very similar to SMBus byte data transactions, but requires the
controller to ignore the ACK bit and to insert a stop condition after
each message.
Add a device SCCB flag and a message stop flag to be passed to
controller drivers.
[JD: Kill rogue definition in go7007 driver.]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/wis-i2c.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index a6ad32b..361978a 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -2122,7 +2122,7 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags, int try; s32 res; - flags &= I2C_M_TEN | I2C_CLIENT_PEC; + flags &= I2C_M_TEN | I2C_CLIENT_PEC | I2C_CLIENT_SCCB; if (adapter->algo->smbus_xfer) { i2c_lock_adapter(adapter); diff --git a/drivers/staging/media/go7007/wis-i2c.h b/drivers/staging/media/go7007/wis-i2c.h index 3c2b9be..6d09c06 100644 --- a/drivers/staging/media/go7007/wis-i2c.h +++ b/drivers/staging/media/go7007/wis-i2c.h @@ -25,11 +25,6 @@ #define I2C_DRIVERID_WIS_TW2804 0xf0f6 #define I2C_DRIVERID_S2250 0xf0f7 -/* Flag to indicate that the client needs to be accessed with SCCB semantics */ -/* We re-use the I2C_M_TEN value so the flag passes through the masks in the - * core I2C code. Major kludge, but the I2C layer ain't exactly flexible. */ -#define I2C_CLIENT_SCCB 0x10 - /* Definitions for new video decoder commands */ struct video_decoder_resolution { |