Commit 23173eae authored Nov 25, 2014 by Alexander Kochetkov Committed by Wolfram Sang Nov 25, 2014

omap: i2c: don't check bus state IP rev3.3 and earlier



Commit 0f5768bf ("i2c: omap: implement workaround for handling
invalid BB-bit values") introduce the error result in boot test fault on
OMAP3530 boards.

The patch fix the error (disable i2c bus test for OMAP3530).

Reported-by: Kevin Hilman <khilman@kernel.org>
Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
Fixes: 0f5768bf ("i2c: omap: implement workaround for handling invalid BB-bit values")
Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent a7750c3e

drivers/i2c/busses/i2c-omap.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -344,9 +344,11 @@ static int omap_i2c_reset(struct omap_i2c_dev *dev)
		/* SYSC register is cleared by the reset; rewrite it */
		omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, sysc);

		if (dev->rev > OMAP_I2C_REV_ON_3430_3530) {
		/* Schedule I2C-bus monitoring on the next transfer */
		dev->bb_valid = 0;
		}
		}

		return 0;
		}
		@@ -460,7 +462,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
		dev->scllstate = scll;
		dev->sclhstate = sclh;

		if (dev->rev < OMAP_I2C_OMAP1_REV_2) {
		if (dev->rev <= OMAP_I2C_REV_ON_3430_3530) {
		/* Not implemented */
		dev->bb_valid = 1;
		}