DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qup_i2c: Calculate combined write length for multiple write transactions

Browse Source 
When a transaction consists of multiple write requests, add up the total
length of the write requests.  If there is a read following the writes,
set the read mode appropriately.

Change-Id: I0c15e14fa4732e4e25f5bb885688662a066b8782
Signed-off-by: Kenneth Heitke <kheitke@codeaurora.org>
This commit is contained in:
Kenneth Heitke
2011-10-20 17:56:03 -06:00
committed by Harini Jayaraman
parent 2b7c5c9d9c
commit 6a852e9dfb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/i2c/busses/i2c-qup.c
View File

@@ -601,9 +601,18 @@ qup_set_wr_mode(struct qup_i2c_dev *dev, int rem)
{ {
int total_len = 0; int total_len = 0;
int ret = 0; int ret = 0;
if (dev->msg->len >= (dev->out_fifo_sz - 1)) { int len = dev->msg->len;
total_len = dev->msg->len + 1 + struct i2c_msg *next = NULL;
(dev->msg->len/(dev->out_blk_sz-1)); if (rem > 1)
next = dev->msg + 1;
while (rem > 1 && next->flags == 0) {
len += next->len + 1;
next = next + 1;
rem--;
}
if (len >= (dev->out_fifo_sz - 1)) {
total_len = len + 1 + (len/(dev->out_blk_sz-1));
writel_relaxed(QUP_WR_BLK_MODE | QUP_PACK_EN | QUP_UNPACK_EN, writel_relaxed(QUP_WR_BLK_MODE | QUP_PACK_EN | QUP_UNPACK_EN,
dev->base + QUP_IO_MODE); dev->base + QUP_IO_MODE);
dev->wr_sz = dev->out_blk_sz; dev->wr_sz = dev->out_blk_sz;
@@ -612,7 +621,6 @@ qup_set_wr_mode(struct qup_i2c_dev *dev, int rem)
dev->base + QUP_IO_MODE); dev->base + QUP_IO_MODE);
if (rem > 1) { if (rem > 1) {
struct i2c_msg *next = dev->msg + 1;
if (next->addr == dev->msg->addr && if (next->addr == dev->msg->addr &&
next->flags == I2C_M_RD) { next->flags == I2C_M_RD) {
qup_set_read_mode(dev, next->len); qup_set_read_mode(dev, next->len);