|
@@ -49,8 +49,8 @@
|
|
|
|
|
|
/* I2C controller revisions present on specific hardware */
|
|
|
#define OMAP_I2C_REV_ON_2430 0x36
|
|
|
-#define OMAP_I2C_REV_ON_3430 0x3C
|
|
|
-#define OMAP_I2C_REV_ON_3530_4430 0x40
|
|
|
+#define OMAP_I2C_REV_ON_3430_3530 0x3C
|
|
|
+#define OMAP_I2C_REV_ON_3630_4430 0x40
|
|
|
|
|
|
/* timeout waiting for the controller to respond */
|
|
|
#define OMAP_I2C_TIMEOUT (msecs_to_jiffies(1000))
|
|
@@ -305,7 +305,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
|
|
|
omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
|
|
|
SYSC_AUTOIDLE_MASK);
|
|
|
|
|
|
- } else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
|
|
|
+ } else if (dev->rev >= OMAP_I2C_REV_ON_3430_3530) {
|
|
|
dev->syscstate = SYSC_AUTOIDLE_MASK;
|
|
|
dev->syscstate |= SYSC_ENAWAKEUP_MASK;
|
|
|
dev->syscstate |= (SYSC_IDLEMODE_SMART <<
|
|
@@ -1020,7 +1020,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|
|
if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)
|
|
|
dev->errata |= I2C_OMAP_ERRATA_I207;
|
|
|
|
|
|
- if (dev->rev <= OMAP_I2C_REV_ON_3430)
|
|
|
+ if (dev->rev <= OMAP_I2C_REV_ON_3430_3530)
|
|
|
dev->errata |= I2C_OMAP_ERRATA_I462;
|
|
|
|
|
|
if (!(dev->flags & OMAP_I2C_FLAG_NO_FIFO)) {
|
|
@@ -1038,7 +1038,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
|
|
|
|
|
dev->fifo_size = (dev->fifo_size / 2);
|
|
|
|
|
|
- if (dev->rev >= OMAP_I2C_REV_ON_3530_4430)
|
|
|
+ if (dev->rev >= OMAP_I2C_REV_ON_3630_4430)
|
|
|
dev->b_hw = 0; /* Disable hardware fixes */
|
|
|
else
|
|
|
dev->b_hw = 1; /* Enable hardware fixes */
|