diff options
-rw-r--r-- | drivers/i2c/busses/i2c-xiic.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index fc2716afdfd9..5e5fae7d87f2 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c | |||
@@ -69,7 +69,7 @@ struct xiic_i2c { | |||
69 | struct i2c_adapter adap; | 69 | struct i2c_adapter adap; |
70 | struct i2c_msg *tx_msg; | 70 | struct i2c_msg *tx_msg; |
71 | spinlock_t lock; | 71 | spinlock_t lock; |
72 | unsigned int tx_pos; | 72 | unsigned int tx_pos; |
73 | unsigned int nmsgs; | 73 | unsigned int nmsgs; |
74 | enum xilinx_i2c_state state; | 74 | enum xilinx_i2c_state state; |
75 | struct i2c_msg *rx_msg; | 75 | struct i2c_msg *rx_msg; |
@@ -272,8 +272,8 @@ static void xiic_read_rx(struct xiic_i2c *i2c) | |||
272 | 272 | ||
273 | bytes_in_fifo = xiic_getreg8(i2c, XIIC_RFO_REG_OFFSET) + 1; | 273 | bytes_in_fifo = xiic_getreg8(i2c, XIIC_RFO_REG_OFFSET) + 1; |
274 | 274 | ||
275 | dev_dbg(i2c->adap.dev.parent, "%s entry, bytes in fifo: %d, msg: %d" | 275 | dev_dbg(i2c->adap.dev.parent, |
276 | ", SR: 0x%x, CR: 0x%x\n", | 276 | "%s entry, bytes in fifo: %d, msg: %d, SR: 0x%x, CR: 0x%x\n", |
277 | __func__, bytes_in_fifo, xiic_rx_space(i2c), | 277 | __func__, bytes_in_fifo, xiic_rx_space(i2c), |
278 | xiic_getreg8(i2c, XIIC_SR_REG_OFFSET), | 278 | xiic_getreg8(i2c, XIIC_SR_REG_OFFSET), |
279 | xiic_getreg8(i2c, XIIC_CR_REG_OFFSET)); | 279 | xiic_getreg8(i2c, XIIC_CR_REG_OFFSET)); |
@@ -340,9 +340,10 @@ static void xiic_process(struct xiic_i2c *i2c) | |||
340 | ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET); | 340 | ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET); |
341 | pend = isr & ier; | 341 | pend = isr & ier; |
342 | 342 | ||
343 | dev_dbg(i2c->adap.dev.parent, "%s entry, IER: 0x%x, ISR: 0x%x, " | 343 | dev_dbg(i2c->adap.dev.parent, "%s: IER: 0x%x, ISR: 0x%x, pend: 0x%x\n", |
344 | "pend: 0x%x, SR: 0x%x, msg: %p, nmsgs: %d\n", | 344 | __func__, ier, isr, pend); |
345 | __func__, ier, isr, pend, xiic_getreg8(i2c, XIIC_SR_REG_OFFSET), | 345 | dev_dbg(i2c->adap.dev.parent, "%s: SR: 0x%x, msg: %p, nmsgs: %d\n", |
346 | __func__, xiic_getreg8(i2c, XIIC_SR_REG_OFFSET), | ||
346 | i2c->tx_msg, i2c->nmsgs); | 347 | i2c->tx_msg, i2c->nmsgs); |
347 | 348 | ||
348 | /* Do not processes a devices interrupts if the device has no | 349 | /* Do not processes a devices interrupts if the device has no |
@@ -542,9 +543,10 @@ static void xiic_start_send(struct xiic_i2c *i2c) | |||
542 | 543 | ||
543 | xiic_irq_clr(i2c, XIIC_INTR_TX_ERROR_MASK); | 544 | xiic_irq_clr(i2c, XIIC_INTR_TX_ERROR_MASK); |
544 | 545 | ||
545 | dev_dbg(i2c->adap.dev.parent, "%s entry, msg: %p, len: %d, " | 546 | dev_dbg(i2c->adap.dev.parent, "%s entry, msg: %p, len: %d", |
546 | "ISR: 0x%x, CR: 0x%x\n", | 547 | __func__, msg, msg->len); |
547 | __func__, msg, msg->len, xiic_getreg32(i2c, XIIC_IISR_OFFSET), | 548 | dev_dbg(i2c->adap.dev.parent, "%s entry, ISR: 0x%x, CR: 0x%x\n", |
549 | __func__, xiic_getreg32(i2c, XIIC_IISR_OFFSET), | ||
548 | xiic_getreg8(i2c, XIIC_CR_REG_OFFSET)); | 550 | xiic_getreg8(i2c, XIIC_CR_REG_OFFSET)); |
549 | 551 | ||
550 | if (!(msg->flags & I2C_M_NOSTART)) { | 552 | if (!(msg->flags & I2C_M_NOSTART)) { |