diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-25 18:54:51 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-20 23:54:52 +0000 |
| commit | 6b7d815c3f37f22c355b00362bc7c7d0bac9baea (patch) | |
| tree | 8eff0a55f310741415c83a5b6232a3744e3a6f68 /drivers/i2c | |
| parent | a8da7fecb6010222fe495cc2b4330b99bca20c61 (diff) | |
| download | linux-6b7d815c3f37f22c355b00362bc7c7d0bac9baea.tar.gz linux-6b7d815c3f37f22c355b00362bc7c7d0bac9baea.tar.bz2 linux-6b7d815c3f37f22c355b00362bc7c7d0bac9baea.zip | |
i2c-mxs: set controller to pio queue mode after reset
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 <s.hauer@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 8022e2390a5a..caf96dc8ca1b 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -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, @@ -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)); |