From patchwork Tue Feb 21 04:49:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 142241 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3C26AB6EE8 for ; Tue, 21 Feb 2012 15:49:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 721F7280DA; Tue, 21 Feb 2012 05:49:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pgqq+KcNUBRg; Tue, 21 Feb 2012 05:49:29 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 954CF280C5; Tue, 21 Feb 2012 05:49:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CCB9F280CA for ; Tue, 21 Feb 2012 05:49:26 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-J9d5rWoC-Y for ; Tue, 21 Feb 2012 05:49:26 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pw0-f44.google.com (mail-pw0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id BB81D280C4 for ; Tue, 21 Feb 2012 05:49:23 +0100 (CET) Received: by pbcwz7 with SMTP id wz7so6263333pbc.3 for ; Mon, 20 Feb 2012 20:49:20 -0800 (PST) Received-SPF: pass (google.com: domain of tom.rini@gmail.com designates 10.68.232.37 as permitted sender) client-ip=10.68.232.37; Authentication-Results: mr.google.com; spf=pass (google.com: domain of tom.rini@gmail.com designates 10.68.232.37 as permitted sender) smtp.mail=tom.rini@gmail.com; dkim=pass header.i=tom.rini@gmail.com Received: from mr.google.com ([10.68.232.37]) by 10.68.232.37 with SMTP id tl5mr7074376pbc.93.1329799760974 (num_hops = 1); Mon, 20 Feb 2012 20:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=6wjgQHDuESjqtAkidUDlQI134JBWkibtLni94lhFNK0=; b=N1/VSvuWU0LGXckFch5Kv34KKwgqFsv764nkWrpLKz+30RlGIUh9DKTI2HCcLPEBvQ TMz04ykVJi0dm8Fp2nfnLIaiUdsLKspXhvO2mk2++2Fw0YizVCPrnL7fa8HXzxE5iJqA Wd2wi76Hn1Z79Qvbf4Lim3jqNYzDVF1o4bx5U= Received: by 10.68.232.37 with SMTP id tl5mr5566576pbc.93.1329799760938; Mon, 20 Feb 2012 20:49:20 -0800 (PST) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id f3sm15010682pbr.61.2012.02.20.20.49.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Feb 2012 20:49:20 -0800 (PST) From: tom.rini@gmail.com To: u-boot@lists.denx.de Date: Mon, 20 Feb 2012 21:49:15 -0700 Message-Id: <4f432250.433c440a.6702.ffffaf89@mx.google.com> X-Mailer: git-send-email 1.7.0.4 Cc: Tom Rini , Heiko Schocher Subject: [U-Boot] [PATCH 1/2] Revert "ARM: AM33XX: Add AM33XX I2C driver support" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Tom Rini This reverts commit 498cbdfe62a8330f6c89765bdd15e60328a26511 as we need to revert the i2c changes that add the support for the platform. Cc: Heiko Schocher Cc: Patil, Rachna Signed-off-by: Tom Rini --- drivers/i2c/omap24xx_i2c.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index f06af02..80932ef 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -147,7 +147,7 @@ static void flush_fifo(void) stat = readw(&i2c_base->stat); if (stat == I2C_STAT_RRDY) { #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_OMAP44XX) || defined(CONFIG_AM33XX) + defined(CONFIG_OMAP44XX) readb(&i2c_base->data); #else readw(&i2c_base->data); @@ -247,8 +247,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) switch (alen) { case 2: /* Send address MSByte */ -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) writew(((addr >> 8) & 0xFF), &i2c_base->data); /* Clearing XRDY event */ @@ -265,8 +264,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) } #endif case 1: -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) /* Send address LSByte */ writew((addr & 0xFF), &i2c_base->data); #else @@ -315,8 +313,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) } if (status & I2C_STAT_RRDY) { -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) buffer[i] = readb(&i2c_base->data); #else *((u16 *)&buffer[i]) = @@ -403,8 +400,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) if (!i2c_error) { if (status & I2C_STAT_XRDY) { switch (alen) { -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) case 2: /* send out MSB byte */ writeb(((addr >> 8) & 0xFF), &i2c_base->data); @@ -424,8 +420,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) break; } case 1: -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) /* send out MSB byte */ writeb((addr & 0xFF), &i2c_base->data); #else @@ -447,8 +442,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) if (!i2c_error) { for (i = ((alen > 1) ? 0 : 1); i < len; i++) { if (status & I2C_STAT_XRDY) { -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_AM33XX) +#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) writeb((buffer[i] & 0xFF), &i2c_base->data); #else