From patchwork Mon Aug 17 22:42:11 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: n@lina0132712
X-Patchwork-Id: 42184
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7HMbtST012854
	for <patchwork-omap@patchwork.kernel.org>;
	Mon, 17 Aug 2009 22:37:56 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758119AbZHQWh3 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 17 Aug 2009 18:37:29 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758258AbZHQWh0
	(ORCPT <rfc822;linux-omap-outgoing>);
	Mon, 17 Aug 2009 18:37:26 -0400
Received: from arroyo.ext.ti.com ([192.94.94.40]:35567 "EHLO
	arroyo.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758257AbZHQWhW (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Mon, 17 Aug 2009 18:37:22 -0400
Received: from dlep35.itg.ti.com ([157.170.170.118])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n7HMbICp015205
	for <linux-omap@vger.kernel.org>; Mon, 17 Aug 2009 17:37:23 -0500
Received: from legion.dal.design.ti.com (localhost [127.0.0.1])
	by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id n7HMbIB4006476;
	Mon, 17 Aug 2009 17:37:18 -0500 (CDT)
Received: from lina0132712 (lina0132712.am.dhcp.ti.com [128.247.79.146])
	by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id
	n7HMbIZ00748; Mon, 17 Aug 2009 17:37:18 -0500 (CDT)
Received: by lina0132712 (Postfix, from userid 1000)
	id A57139D192; Mon, 17 Aug 2009 17:42:11 -0500 (CDT)
From: n@lina0132712
To: linux-omap@vger.kernel.org
Cc: Moiz Sonasath <m-sonasath@ti.com>
Subject: [PATCH 3/3] i2c-omap: Enable workaround for Errata 1.153 based on
Date: Mon, 17 Aug 2009 17:42:11 -0500
Message-Id: <1250548931-18279-4-git-send-email-n>
X-Mailer: git-send-email 1.5.6.3
In-Reply-To: <1250548931-18279-3-git-send-email-n>
References: <1250548931-18279-1-git-send-email-n>
	<1250548931-18279-2-git-send-email-n>
	<1250548931-18279-3-git-send-email-n>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org

From: Moiz Sonasath <m-sonasath@ti.com>

Silicon Errata 1.153 has been fixed on OMAP 3630|4430 with the use of a later
version of I2C IP block.

The errata impacts OMAP 2420|2430|3430, enable the workaround for these based 
on I2C IP block revision number instead of OMAP CPU type

Signed-off-by: Moiz Sonasath <m-sonasath@ti.com>
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com
---
 drivers/i2c/busses/i2c-omap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 16b39f4..827da08 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -784,7 +784,7 @@ complete:
 				 * memory to the I2C interface.
 				 */
 
-				if (cpu_is_omap34xx()) {
+				if (dev->rev <= OMAP_I2C_REV_ON_3430) {
 						while (!(stat & OMAP_I2C_STAT_XUDF)) {
 							if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
 								omap_i2c_ack_stat(dev, stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));