|
@@ -173,7 +173,7 @@ enum {
|
|
|
|
|
|
/* Errata definitions */
|
|
|
#define I2C_OMAP_ERRATA_I207 (1 << 0)
|
|
|
-#define I2C_OMAP3_1P153 (1 << 1)
|
|
|
+#define I2C_OMAP_ERRATA_I462 (1 << 1)
|
|
|
|
|
|
struct omap_i2c_dev {
|
|
|
struct device *dev;
|
|
@@ -718,11 +718,11 @@ omap_i2c_omap1_isr(int this_irq, void *dev_id)
|
|
|
#endif
|
|
|
|
|
|
/*
|
|
|
- * OMAP3430 Errata 1.153: When an XRDY/XDR is hit, wait for XUDF before writing
|
|
|
+ * OMAP3430 Errata i462: When an XRDY/XDR is hit, wait for XUDF before writing
|
|
|
* data to DATA_REG. Otherwise some data bytes can be lost while transferring
|
|
|
* them from the memory to the I2C interface.
|
|
|
*/
|
|
|
-static int errata_omap3_1p153(struct omap_i2c_dev *dev, u16 *stat, int *err)
|
|
|
+static int errata_omap3_i462(struct omap_i2c_dev *dev, u16 *stat, int *err)
|
|
|
{
|
|
|
unsigned long timeout = 10000;
|
|
|
|
|
@@ -881,8 +881,8 @@ complete:
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if ((dev->errata & I2C_OMAP3_1P153) &&
|
|
|
- errata_omap3_1p153(dev, &stat, &err))
|
|
|
+ if ((dev->errata & I2C_OMAP_ERRATA_I462) &&
|
|
|
+ errata_omap3_i462(dev, &stat, &err))
|
|
|
goto complete;
|
|
|
|
|
|
omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
|
|
@@ -1020,7 +1020,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|
|
dev->errata |= I2C_OMAP_ERRATA_I207;
|
|
|
|
|
|
if (dev->rev <= OMAP_I2C_REV_ON_3430)
|
|
|
- dev->errata |= I2C_OMAP3_1P153;
|
|
|
+ dev->errata |= I2C_OMAP_ERRATA_I462;
|
|
|
|
|
|
if (!(dev->flags & OMAP_I2C_FLAG_NO_FIFO)) {
|
|
|
u16 s;
|