Skip to content

Commit

Permalink
OMAP3: I2C: Clean up Errata 1p153 handling
Browse files Browse the repository at this point in the history
Clean up existing Errata 1p153 handling to use generic
errata handling mechanism through dev flag.

Signed-off-by: Manjunatha GK <[email protected]>
Cc: Nishanth Menon <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Signed-off-by: Ben Dooks <[email protected]>
  • Loading branch information
manjugk manjugk authored and Ben Dooks committed May 19, 2010
1 parent f3083d9 commit 8a9d97d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ enum {

/* Errata definitions */
#define I2C_OMAP_ERRATA_I207 (1 << 0)
#define I2C_OMAP3_1P153 (1 << 1)

struct omap_i2c_dev {
struct device *dev;
Expand Down Expand Up @@ -954,7 +955,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
break;
}

if ((dev->rev <= OMAP_I2C_REV_ON_3430) &&
if ((dev->errata & I2C_OMAP3_1P153) &&
errata_omap3_1p153(dev, &stat, &err))
goto complete;

Expand Down Expand Up @@ -1057,6 +1058,9 @@ omap_i2c_probe(struct platform_device *pdev)

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

if (dev->rev <= OMAP_I2C_REV_ON_3430)
dev->errata |= I2C_OMAP3_1P153;

if (!(cpu_class_is_omap1() || cpu_is_omap2420())) {
u16 s;

Expand Down

0 comments on commit 8a9d97d

Please sign in to comment.