Skip to content

Commit

Permalink
i2c: omap: re-factor receive/transmit data loop
Browse files Browse the repository at this point in the history 
re-factor the common parts to a separate function,
so that code is easier to read and understand.

No functional changes.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
  • Loading branch information
Felipe Balbi authored and Wolfram Sang committed Sep 12, 2012
1 parent 4151e74 commit 3312d25
Showing 1 changed file with 82 additions and 122 deletions.
204 changes: 82 additions & 122 deletions drivers/i2c/busses/i2c-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,12 +752,81 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev)
return 0;
}

static void omap_i2c_receive_data(struct omap_i2c_dev *dev, u8 num_bytes,
bool is_rdr)
{
u16 w;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev, "%s without data",
is_rdr ? "RDR" : "RRDY");
break;
}

w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG);
*dev->buf++ = w;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags & OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
*dev->buf++ = w >> 8;
dev->buf_len--;
}
}
}
}

static int omap_i2c_transmit_data(struct omap_i2c_dev *dev, u8 num_bytes,
bool is_xdr)
{
u16 w;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev, "%s without data",
is_xdr ? "XDR" : "XRDY");
break;
}

w = *dev->buf++;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags & OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
w |= *dev->buf++ << 8;
dev->buf_len--;
}
}

if (dev->errata & I2C_OMAP_ERRATA_I462) {
int ret;

ret = errata_omap3_i462(dev);
if (ret < 0)
return ret;
}

omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
}

return 0;
}

static irqreturn_t
omap_i2c_isr(int this_irq, void *dev_id)
{
struct omap_i2c_dev *dev = dev_id;
u16 bits;
u16 stat, w;
u16 stat;
int err, count = 0;

if (pm_runtime_suspended(dev->dev))
Expand Down Expand Up @@ -810,30 +879,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
if (dev->fifo_size)
num_bytes = dev->buf_len;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev,
"RDR IRQ while no data"
" requested\n");
break;
}

w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG);
*dev->buf++ = w;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
*dev->buf++ = w >> 8;
dev->buf_len--;
}
}
}
omap_i2c_receive_data(dev, num_bytes, true);

if (dev->errata & I2C_OMAP_ERRATA_I207)
i2c_omap_errata_i207(dev, stat);
Expand All @@ -848,124 +894,38 @@ omap_i2c_isr(int this_irq, void *dev_id)
if (dev->fifo_size)
num_bytes = dev->fifo_size;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev,
"RRDY IRQ while no data"
" requested\n");
break;
}

w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG);
*dev->buf++ = w;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
*dev->buf++ = w >> 8;
dev->buf_len--;
}
}
}

omap_i2c_receive_data(dev, num_bytes, false);
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
continue;
}

if (stat & OMAP_I2C_STAT_XDR) {
u8 num_bytes = 1;
int ret;

if (dev->fifo_size)
num_bytes = dev->buf_len;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev,
"XDR IRQ while no "
"data to send\n");
break;
}

w = *dev->buf++;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
w |= *dev->buf++ << 8;
dev->buf_len--;
}
}

if (dev->errata & I2C_OMAP_ERRATA_I462) {
int ret;

ret = errata_omap3_i462(dev);
stat = omap_i2c_read_reg(dev,
OMAP_I2C_STAT_REG);

if (ret < 0)
goto complete;
}

omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
}
ret = omap_i2c_transmit_data(dev, num_bytes, true);
stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
if (ret < 0)
goto complete;

omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR);
continue;
}

if (stat & OMAP_I2C_STAT_XRDY) {
u8 num_bytes = 1;
int ret;

if (dev->fifo_size)
num_bytes = dev->fifo_size;

while (num_bytes--) {
if (!dev->buf_len) {
dev_err(dev->dev,
"XRDY IRQ while no "
"data to send\n");
break;
}

w = *dev->buf++;
dev->buf_len--;

/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
w |= *dev->buf++ << 8;
dev->buf_len--;
}
}

if (dev->errata & I2C_OMAP_ERRATA_I462) {
int ret;

ret = errata_omap3_i462(dev);
stat = omap_i2c_read_reg(dev,
OMAP_I2C_STAT_REG);

if (ret < 0)
goto complete;
}

omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
}
ret = omap_i2c_transmit_data(dev, num_bytes, false);
stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
if (ret < 0)
goto complete;

omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
continue;
Expand Down

0 comments on commit 3312d25

Please sign in to comment.