From: Tony Lindgren <tony@atomide.com>
To: linux-i2c@vger.kernel.org, ben-linux@fluff.org
Cc: Nishanth Menon <nm@ti.com>, Manjunatha GK <manjugk@ti.com>,
linux-omap@vger.kernel.org,
Alexander Shishkin <virtuoso@slind.org>
Subject: [PATCH 6/6] OMAP3: I2C: Clean up Errata 1p153 handling
Date: Tue, 11 May 2010 11:35:23 -0700 [thread overview]
Message-ID: <20100511183523.15596.19585.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100511182854.15596.56293.stgit@baageli.muru.com>
From: manjugk manjugk <manjugk@ti.com>
Clean up existing Errata 1p153 handling to use generic
errata handling mechanism through dev flag.
Signed-off-by: Manjunatha GK <manjugk@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/i2c/busses/i2c-omap.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index fdba131..7674efb 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -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;
@@ -954,7 +955,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;
@@ -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;
prev parent reply other threads:[~2010-05-11 18:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-11 18:35 [PATCH 0/6] i2c-omap patches for 2.6.35 merge window Tony Lindgren
[not found] ` <20100511182854.15596.56293.stgit-XB442sTQ5VIxQTnqJstS8Q@public.gmane.org>
2010-05-11 18:35 ` [PATCH 1/6] omap: i2c: Add i2c support on omap4 platform Tony Lindgren
2010-05-11 18:35 ` [PATCH 2/6] i2c-omap: add mpu wake up latency constraint in i2c Tony Lindgren
2010-05-11 18:35 ` [PATCH 3/6] omap: i2c: make errata 1.153 workaround a separate function Tony Lindgren
2010-05-11 18:35 ` [PATCH 4/6] omap: i2c: add a timeout to the busy waiting Tony Lindgren
2010-05-11 18:35 ` [PATCH 5/6] OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt Tony Lindgren
2010-05-11 23:10 ` [PATCH 0/6] i2c-omap patches for 2.6.35 merge window Ben Dooks
2010-05-11 23:54 ` Tony Lindgren
2010-05-11 18:35 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100511183523.15596.19585.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=ben-linux@fluff.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=manjugk@ti.com \
--cc=nm@ti.com \
--cc=virtuoso@slind.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).