Skip to contentSkip to conversation

OMAP3: I2C: Clean up Errata 1p153 handling

PATCH New Manjunatha GK 2 participants 2 messages Apr 28, 2010 – May 10, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP3: I2C: Clean up Errata 1p153 handling

Clean up existing Errata 1p153 handling to use generic errata handling mechanism through dev flag.

---
PS : This patch has dependency on the patch:
https://patchwork.kernel.org/patch/95616/

 drivers/i2c/busses/i2c-omap.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/i2c/busses/i2c-omap.c +5 -1
index 5f5207e..0caa8fe 100644
@@ -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;
@@ -946,7 +947,7 @@ complete:
 					break;
 				}
 
-				if ((dev->rev <= OMAP_I2C_REV_ON_3430) &&
+				if ((dev->errata & I2C_OMAP3_1P153) &&
 				    errata_omap3_1p153(dev, &stat, &err))
 					goto complete;
 
@@ -1049,6 +1050,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;
 
Signature · 1 line
1.6.0.4
maintainer
#1 lore raw

PATCH 1/1 OMAP3: I2C: Clean up Errata 1p153 handling

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: i2c-omap-for-ben

Initial commit ID (Likely to change): f95ba23e386509330595c45052ab4cef453ca262

PatchWorks
http://patchwork.kernel.org/patch/95686/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=f95ba23e386509330595c45052ab4cef453ca262