diff options
author | Neelesh Gupta <neelegup@linux.vnet.ibm.com> | 2015-03-13 10:25:33 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2015-03-14 07:08:21 -0400 |
commit | bf07038051ddd6c1e017cd50933e314040a69b11 (patch) | |
tree | 0f2c2b27f8b5f757bdd49f64f3e035126492f8c4 /drivers/i2c | |
parent | 338f1ab6c4ea60cbc8ee57b78707d4b8d0219519 (diff) |
i2c: opal: Update quirk flags to do write-then-anything
Hardware can do write-then-anything. Activate that.
Signed-off-by: Neelesh Gupta <neelegup@linux.vnet.ibm.com>
[wsa: cosmetic updates]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-opal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-opal.c b/drivers/i2c/busses/i2c-opal.c index b2788ecad5b3..75dd6d041241 100644 --- a/drivers/i2c/busses/i2c-opal.c +++ b/drivers/i2c/busses/i2c-opal.c | |||
@@ -104,7 +104,8 @@ static int i2c_opal_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, | |||
104 | req.buffer_ra = cpu_to_be64(__pa(msgs[0].buf)); | 104 | req.buffer_ra = cpu_to_be64(__pa(msgs[0].buf)); |
105 | break; | 105 | break; |
106 | case 2: | 106 | case 2: |
107 | req.type = OPAL_I2C_SM_READ; | 107 | req.type = (msgs[1].flags & I2C_M_RD) ? |
108 | OPAL_I2C_SM_READ : OPAL_I2C_SM_WRITE; | ||
108 | req.addr = cpu_to_be16(msgs[0].addr); | 109 | req.addr = cpu_to_be16(msgs[0].addr); |
109 | req.subaddr_sz = msgs[0].len; | 110 | req.subaddr_sz = msgs[0].len; |
110 | for (i = 0; i < msgs[0].len; i++) | 111 | for (i = 0; i < msgs[0].len; i++) |
@@ -199,13 +200,12 @@ static const struct i2c_algorithm i2c_opal_algo = { | |||
199 | .functionality = i2c_opal_func, | 200 | .functionality = i2c_opal_func, |
200 | }; | 201 | }; |
201 | 202 | ||
202 | /* For two messages, we basically support only simple | 203 | /* |
203 | * smbus transactions of a write plus a read. We might | 204 | * For two messages, we basically support simple smbus transactions of a |
204 | * want to allow also two writes but we'd have to bounce | 205 | * write-then-anything. |
205 | * the data into a single buffer. | ||
206 | */ | 206 | */ |
207 | static struct i2c_adapter_quirks i2c_opal_quirks = { | 207 | static struct i2c_adapter_quirks i2c_opal_quirks = { |
208 | .flags = I2C_AQ_COMB_WRITE_THEN_READ, | 208 | .flags = I2C_AQ_COMB | I2C_AQ_COMB_WRITE_FIRST | I2C_AQ_COMB_SAME_ADDR, |
209 | .max_comb_1st_msg_len = 4, | 209 | .max_comb_1st_msg_len = 4, |
210 | }; | 210 | }; |
211 | 211 | ||