projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8da7fe
)
i2c-mxs: set controller to pio queue mode after reset
author
Sascha Hauer
<s.hauer@pengutronix.de>
Fri, 25 Feb 2011 17:54:51 +0000
(18:54 +0100)
committer
Ben Dooks
<ben-linux@fluff.org>
Sun, 20 Mar 2011 23:54:52 +0000
(23:54 +0000)
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>
drivers/i2c/busses/i2c-mxs.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-mxs.c
b/drivers/i2c/busses/i2c-mxs.c
index
8022e23
..
caf96dc
100644
(file)
--- 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));