On Fri, Feb 25, 2011 at 06:54:51PM +0100, Wolfram Sang wrote:
> From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
>
> mxs_reset_block() clears the PIO_QUEUE_MODE bit. So we have
> to set it again after a controller reset.
-rc candidate?
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> Cc: Ben Dooks <ben-linux@xxxxxxxxx>
> ---
> 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 8022e23..caf96dc 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));
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Ben Dooks, ben@xxxxxxxxx, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
