diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-30 04:55:34 -0400 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2012-05-30 04:55:34 -0400 |
commit | 14674e70119ea01549ce593d8901a797f8a90f74 (patch) | |
tree | 15474236bfa505aa396bf2892cbbee65e842b94b /drivers/i2c/busses/i2c-s3c2410.c | |
parent | 838bfa6049fb84dc66c9c9bbeb3a968ec987fd3d (diff) |
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
Since there are uses for I2C_M_NOSTART which are much more sensible and
standard than most of the protocol mangling functionality (the main one
being gather writes to devices where something like a register address
needs to be inserted before a block of data) create a new I2C_FUNC_NOSTART
for this feature and update all the users to use it.
Also strengthen the disrecommendation of the protocol mangling while we're
at it.
In the case of regmap-i2c we remove the requirement for mangling as
I2C_M_NOSTART is the only mangling feature which is being used.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-s3c2410.c')
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index fa0b13490873..01959154572d 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -626,7 +626,8 @@ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap, | |||
626 | /* declare our i2c functionality */ | 626 | /* declare our i2c functionality */ |
627 | static u32 s3c24xx_i2c_func(struct i2c_adapter *adap) | 627 | static u32 s3c24xx_i2c_func(struct i2c_adapter *adap) |
628 | { | 628 | { |
629 | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; | 629 | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_NOSTART | |
630 | I2C_FUNC_PROTOCOL_MANGLING; | ||
630 | } | 631 | } |
631 | 632 | ||
632 | /* i2c bus registration info */ | 633 | /* i2c bus registration info */ |