public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
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,
	Tasslehoff Kjappfot <tasskjapp@gmail.com>,
	Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: [PATCHv7 16/18] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153
Date: Wed, 11 Apr 2012 16:22:27 +0530	[thread overview]
Message-ID: <1334141549-8288-17-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334141549-8288-1-git-send-email-shubhrajyoti@ti.com>

From: Tasslehoff Kjappfot <tasskjapp@gmail.com>

i2c_probe set the dev->errata flag, but omap_i2c_init cleared the flag again.
Move the errata handling to i2c_probe.

Signed-off-by: Tasslehoff Kjappfot <tasskjapp@gmail.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 666a365..7489eb6 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -431,11 +431,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
 	/* Take the I2C module out of reset: */
 	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, OMAP_I2C_CON_EN);
 
-	dev->errata = 0;
-
-	if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)
-		dev->errata |= I2C_OMAP_ERRATA_I207;
-
 	/* Enable interrupts */
 	dev->iestate = (OMAP_I2C_IE_XRDY | OMAP_I2C_IE_RRDY |
 			OMAP_I2C_IE_ARDY | OMAP_I2C_IE_NACK |
@@ -1060,6 +1055,11 @@ omap_i2c_probe(struct platform_device *pdev)
 
 	dev->rev = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) & 0xff;
 
+	dev->errata = 0;
+
+	if (dev->flags & OMAP_I2C_FLAG_APPLY_ERRATA_I207)
+		dev->errata |= I2C_OMAP_ERRATA_I207;
+
 	if (dev->rev <= OMAP_I2C_REV_ON_3430_3530)
 		dev->errata |= I2C_OMAP3_1P153;
 
-- 
1.7.4.1


  parent reply	other threads:[~2012-04-11 10:52 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-11 10:52 [PATCHv7 00/18] I2C updates Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 01/18] I2C: OMAP: make omap_i2c_unidle/idle functions depend on CONFIG_PM_RUNTIME Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 04/18] I2C: OMAP: I2C register restore only if context is lost Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 05/18] I2C: OMAP: Fix the interrupt clearing in OMAP4 Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 07/18] I2C: OMAP: Optimise the remove code Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 08/18] I2C: OMAP: Fix the error handling Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 09/18] I2C: OMAP: Correct I2C revision for OMAP3 Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 10/18] I2C: OMAP: Don't check if wait_for_completion_timeout() returns less than zero Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 13/18] I2C: OMAP: Handle error check for pm runtime Shubhrajyoti D
     [not found] ` <1334141549-8288-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 10:52   ` [PATCHv7 02/18] I2C: OMAP: Remove reset at init Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 03/18] I2C: OMAP: Recover from Bus Busy condition Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 06/18] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 11/18] I2C: OMAP: use devm_* functions Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 12/18] I2C: OMAP: Fix the crash in i2c remove Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 14/18] I2C: OMAP: Use SET_RUNTIME_PM_OPS Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 15/18] I2C: OMAP: make the read ready processing a separate function Shubhrajyoti D
2012-04-11 10:52   ` [PATCHv7 17/18] I2C: OMAP: Do not set the XUDF if the underflow is not reached Shubhrajyoti D
2012-04-11 11:01   ` [PATCHv7 00/18] I2C updates Shubhrajyoti
2012-04-11 10:52 ` Shubhrajyoti D [this message]
2012-04-11 10:52 ` [PATCHv7 18/18] I2C: OMAP: Rename the 1p153 to the erratum id i462 Shubhrajyoti D
  -- strict thread matches above, loose matches on Subject: below --
2012-04-11 11:12 [PATCHv7 00/18] I2C updates Shubhrajyoti D
     [not found] ` <1334142776-10583-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 11:12   ` [PATCHv7 16/18] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153 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=1334141549-8288-17-git-send-email-shubhrajyoti@ti.com \
    --to=shubhrajyoti@ti.com \
    --cc=ben-linux@fluff.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tasskjapp@gmail.com \
    --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