Skip to content

Commit

Permalink
i2c-mxs: set controller to pio queue mode after reset
Browse files Browse the repository at this point in the history
mxs_reset_block() clears the PIO_QUEUE_MODE bit. So we have
to set it again after a controller reset.

Signed-off-by: Sascha Hauer <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
Cc: Ben Dooks <[email protected]>
Signed-off-by: Ben Dooks <[email protected]>
  • Loading branch information
saschahauer authored and Ben Dooks committed Mar 20, 2011
1 parent a8da7fe commit 6b7d815
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/i2c/busses/i2c-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ static void mxs_i2c_reset(struct mxs_i2c_dev *i2c)
{
mxs_reset_block(i2c->regs);
writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET);
writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE,
i2c->regs + MXS_I2C_QUEUECTRL_SET);
}

static void mxs_i2c_pioq_setup_read(struct mxs_i2c_dev *i2c, u8 addr, int len,
Expand Down Expand Up @@ -347,8 +349,6 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev)

/* Do reset to enforce correct startup after pinmuxing */
mxs_i2c_reset(i2c);
writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE,
i2c->regs + MXS_I2C_QUEUECTRL_SET);

adap = &i2c->adapter;
strlcpy(adap->name, "MXS I2C adapter", sizeof(adap->name));
Expand Down

0 comments on commit 6b7d815

Please sign in to comment.