|
@@ -69,7 +69,7 @@ struct xiic_i2c {
|
|
struct i2c_adapter adap;
|
|
struct i2c_adapter adap;
|
|
struct i2c_msg *tx_msg;
|
|
struct i2c_msg *tx_msg;
|
|
spinlock_t lock;
|
|
spinlock_t lock;
|
|
- unsigned int tx_pos;
|
|
|
|
|
|
+ unsigned int tx_pos;
|
|
unsigned int nmsgs;
|
|
unsigned int nmsgs;
|
|
enum xilinx_i2c_state state;
|
|
enum xilinx_i2c_state state;
|
|
struct i2c_msg *rx_msg;
|
|
struct i2c_msg *rx_msg;
|
|
@@ -272,8 +272,8 @@ static void xiic_read_rx(struct xiic_i2c *i2c)
|
|
|
|
|
|
bytes_in_fifo = xiic_getreg8(i2c, XIIC_RFO_REG_OFFSET) + 1;
|
|
bytes_in_fifo = xiic_getreg8(i2c, XIIC_RFO_REG_OFFSET) + 1;
|
|
|
|
|
|
- dev_dbg(i2c->adap.dev.parent, "%s entry, bytes in fifo: %d, msg: %d"
|
|
|
|
- ", SR: 0x%x, CR: 0x%x\n",
|
|
|
|
|
|
+ dev_dbg(i2c->adap.dev.parent,
|
|
|
|
+ "%s entry, bytes in fifo: %d, msg: %d, SR: 0x%x, CR: 0x%x\n",
|
|
__func__, bytes_in_fifo, xiic_rx_space(i2c),
|
|
__func__, bytes_in_fifo, xiic_rx_space(i2c),
|
|
xiic_getreg8(i2c, XIIC_SR_REG_OFFSET),
|
|
xiic_getreg8(i2c, XIIC_SR_REG_OFFSET),
|
|
xiic_getreg8(i2c, XIIC_CR_REG_OFFSET));
|
|
xiic_getreg8(i2c, XIIC_CR_REG_OFFSET));
|
|
@@ -340,9 +340,10 @@ static void xiic_process(struct xiic_i2c *i2c)
|
|
ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET);
|
|
ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET);
|
|
pend = isr & ier;
|
|
pend = isr & ier;
|
|
|
|
|
|
- dev_dbg(i2c->adap.dev.parent, "%s entry, IER: 0x%x, ISR: 0x%x, "
|
|
|
|
- "pend: 0x%x, SR: 0x%x, msg: %p, nmsgs: %d\n",
|
|
|
|
- __func__, ier, isr, pend, xiic_getreg8(i2c, XIIC_SR_REG_OFFSET),
|
|
|
|
|
|
+ dev_dbg(i2c->adap.dev.parent, "%s: IER: 0x%x, ISR: 0x%x, pend: 0x%x\n",
|
|
|
|
+ __func__, ier, isr, pend);
|
|
|
|
+ dev_dbg(i2c->adap.dev.parent, "%s: SR: 0x%x, msg: %p, nmsgs: %d\n",
|
|
|
|
+ __func__, xiic_getreg8(i2c, XIIC_SR_REG_OFFSET),
|
|
i2c->tx_msg, i2c->nmsgs);
|
|
i2c->tx_msg, i2c->nmsgs);
|
|
|
|
|
|
/* Do not processes a devices interrupts if the device has no
|
|
/* Do not processes a devices interrupts if the device has no
|
|
@@ -542,9 +543,10 @@ static void xiic_start_send(struct xiic_i2c *i2c)
|
|
|
|
|
|
xiic_irq_clr(i2c, XIIC_INTR_TX_ERROR_MASK);
|
|
xiic_irq_clr(i2c, XIIC_INTR_TX_ERROR_MASK);
|
|
|
|
|
|
- dev_dbg(i2c->adap.dev.parent, "%s entry, msg: %p, len: %d, "
|
|
|
|
- "ISR: 0x%x, CR: 0x%x\n",
|
|
|
|
- __func__, msg, msg->len, xiic_getreg32(i2c, XIIC_IISR_OFFSET),
|
|
|
|
|
|
+ dev_dbg(i2c->adap.dev.parent, "%s entry, msg: %p, len: %d",
|
|
|
|
+ __func__, msg, msg->len);
|
|
|
|
+ dev_dbg(i2c->adap.dev.parent, "%s entry, ISR: 0x%x, CR: 0x%x\n",
|
|
|
|
+ __func__, xiic_getreg32(i2c, XIIC_IISR_OFFSET),
|
|
xiic_getreg8(i2c, XIIC_CR_REG_OFFSET));
|
|
xiic_getreg8(i2c, XIIC_CR_REG_OFFSET));
|
|
|
|
|
|
if (!(msg->flags & I2C_M_NOSTART)) {
|
|
if (!(msg->flags & I2C_M_NOSTART)) {
|