diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
| commit | 373e42a25dcc53782c1b1eca086dadf8b5adb546 (patch) | |
| tree | 8b9e56b9426a35486a5a5d6169edf0442b67b733 /drivers/i2c/busses/i2c-designware-core.h | |
| parent | 30eb987e02b3481e8b9c41d564eed49928f91478 (diff) | |
| parent | 0bfd8ffeff9dda08c69381d65c72e0aa58706ef6 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-linux-linaro-lsk
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 9c1840ee09c..e761ad18dd6 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -60,6 +60,7 @@ * @adapter: i2c subsystem adapter node * @tx_fifo_depth: depth of the hardware tx fifo * @rx_fifo_depth: depth of the hardware rx fifo + * @rx_outstanding: current master-rx elements in tx fifo */ struct dw_i2c_dev { struct device *dev; @@ -88,6 +89,7 @@ struct dw_i2c_dev { u32 master_cfg; unsigned int tx_fifo_depth; unsigned int rx_fifo_depth; + int rx_outstanding; }; #define ACCESS_SWAP 0x00000001 |