From: Shubhrajyoti D <shubhrajyoti@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
ben-linux@fluff.org, tony@atomide.com, w.sang@pengutronix.de,
Jon Hunter <jon-hunter@ti.com>,
Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: [PATCHv6 09/19] I2C: OMAP: Correct I2C revision for OMAP3
Date: Tue, 10 Apr 2012 16:26:27 +0530 [thread overview]
Message-ID: <1334055397-899-10-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334055397-899-1-git-send-email-shubhrajyoti@ti.com>
From: Jon Hunter <jon-hunter@ti.com>
The OMAP3530 is based upon the same silicon as the OMAP3430 and so the I2C
revision is the same for 3430 and 3530. However, the OMAP3630 device has the
same I2C revision as OMAP4. Correct the revision definition to reflect this.
This patch is based on work done by Jon Hunter <jon-hunter@ti.com>
Changes from his patch
- Update OMAP_I2C_REV_ON_3430 also to reflect that it is same as 3530
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
drivers/i2c/busses/i2c-omap.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a461097..959e97c 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -50,8 +50,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))
@@ -298,7 +298,7 @@ static int omap_i2c_reset(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 <<
@@ -1051,7 +1051,7 @@ 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)
+ if (dev->rev <= OMAP_I2C_REV_ON_3430_3530)
dev->errata |= I2C_OMAP3_1P153;
if (!(dev->flags & OMAP_I2C_FLAG_NO_FIFO)) {
@@ -1069,7 +1069,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 */
--
1.7.4.1
next prev parent reply other threads:[~2012-04-10 10:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 10:56 [PATCH 00/19] I2C updates Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 02/19] I2C: OMAP: Remove reset at init Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 03/19] I2C: OMAP: Recover from Bus Busy condition Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 05/19] I2C: OMAP: Fix the interrupt clearing in OMAP4 Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 06/19] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable Shubhrajyoti D
2012-04-10 10:56 ` Shubhrajyoti D [this message]
2012-04-10 10:56 ` [PATCHv6 10/19] I2C: OMAP: Don't check if wait_for_completion_timeout() returns less than zero Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 12/19] I2C: OMAP: Fix the crash in i2c remove Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 13/19] I2C: OMAP: Handle error check for pm runtime Shubhrajyoti D
[not found] ` <1334055397-899-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-10 10:56 ` [PATCHv6 01/19] I2C: OMAP: make omap_i2c_unidle/idle functions depend on CONFIG_PM_RUNTIME Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 04/19] I2C: OMAP: I2C register restore only if context is lost Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 07/19] I2C: OMAP: Optimise the remove code Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 08/19] I2C: OMAP: Fix the error handling Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 11/19] I2C: OMAP: use devm_* functions Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 14/19] I2C: OMAP: Use SET_RUNTIME_PM_OPS Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 15/19] I2C: OMAP: make the read ready processing a separate function Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 16/19] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153 Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 19/19] ARM: OMAP4: hwmod data: I2C: add flag for context restore Shubhrajyoti D
2012-04-10 18:13 ` Paul Walmsley
[not found] ` <alpine.DEB.2.00.1204101212530.20894-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>
2012-04-11 5:40 ` Shubhrajyoti
2012-04-10 11:31 ` [PATCH 00/19] I2C updates S, Venkatraman
2012-04-10 11:41 ` Felipe Balbi
[not found] ` <20120410114153.GR20616-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2012-04-10 14:56 ` Shubhrajyoti
2012-04-10 10:56 ` [PATCHv6 17/19] I2C: OMAP: Do not set the XUDF if the underflow is not reached Shubhrajyoti D
2012-04-10 10:56 ` [PATCHv6 18/19] I2C: OMAP: Rename the 1p153 to the erratum id i462 Shubhrajyoti D
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=1334055397-899-10-git-send-email-shubhrajyoti@ti.com \
--to=shubhrajyoti@ti.com \
--cc=ben-linux@fluff.org \
--cc=jon-hunter@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
--cc=w.sang@pengutronix.de \
/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