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

Commit 9aa8ec67 authored by Tasslehoff Kjappfot's avatar Tasslehoff Kjappfot Committed by Wolfram Sang
Browse files

I2C: OMAP: prevent the overwrite of the errata flags 



i2c_probe set the dev->errata flag, but omap_i2c_init cleared the flag again.
Prevent the overwrite of the errata flags.Move the errata handling to a unified
place in probe to prevent such errors.

Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTasslehoff Kjappfot <tasskjapp@gmail.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 3b0fb97c

drivers/i2c/busses/i2c-omap.c

+5 −5
Original line number Diff line number Diff line
@@ -427,11 +427,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) 
	/* Take the I2C module out of reset: */

	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, OMAP_I2C_CON_EN);



	dev->errata = 0;



	if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)

		dev->errata |= I2C_OMAP_ERRATA_I207;



	/* Enable interrupts */

	dev->iestate = (OMAP_I2C_IE_XRDY | OMAP_I2C_IE_RRDY |

			OMAP_I2C_IE_ARDY | OMAP_I2C_IE_NACK |
@@ -1019,6 +1014,11 @@ omap_i2c_probe(struct platform_device *pdev) 


	dev->rev = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) & 0xff;



	dev->errata = 0;



	if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)

		dev->errata |= I2C_OMAP_ERRATA_I207;



	if (dev->rev <= OMAP_I2C_REV_ON_3430)

		dev->errata |= I2C_OMAP3_1P153;