Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7d815c authored by Sascha Hauer's avatar Sascha Hauer Committed by Ben Dooks
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent a8da7fec

drivers/i2c/busses/i2c-mxs.c

+2 −2
Original line number Diff line number Diff line
@@ -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));