From patchwork Mon May 21 16:46:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 160393 X-Patchwork-Delegate: trini@ti.com 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 F3BB4B6EF1 for ; Tue, 22 May 2012 02:48:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1E03280D2; Mon, 21 May 2012 18:47:29 +0200 (CEST) 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 mx6IRgZbBp-x; Mon, 21 May 2012 18:47:29 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BD34280EE; Mon, 21 May 2012 18:47:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3335A280EC for ; Mon, 21 May 2012 18:47:17 +0200 (CEST) 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 qVTEBVfipQMH for ; Mon, 21 May 2012 18:47:06 +0200 (CEST) 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-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by theia.denx.de (Postfix) with ESMTPS id 53340280DD for ; Mon, 21 May 2012 18:46:51 +0200 (CEST) Received: by dacx6 with SMTP id x6so6397575dac.3 for ; Mon, 21 May 2012 09:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=vph03FPgXNKvpEQ9/GPX1kqJgD+ZaYQJ7y6P2PRto1k=; b=c3R1rS6l3pOqw9Mlj6gYIozKHwtoFKISY3ko+sUbHJxLvGRcc0EW7i3YZgN5rNUZ9j HAiSo4vwxIZVvapH+11GQ9ouUqhdAGS/box1mw5SogRDasfn1KptM2LlyKS9YpUDuFI0 GvQCEhiqtx6SneXkGbjsrD0glOWIm8dtnDJa1REQ+iuT8UnjmX5J8AhUsX2oywXHwYHK qSjwK46I0tP+BDFCosEQX5oGJ6s6HSrpeOi/GPCJ71RWe0PBR/lPJeQnV0tcLUddeBt2 Kd5qw4d1i0oks12fxYSTjJhwVwFa+ZwzX5VdJAmOs+4o80sVCKtpe38OanouwEIj5EW8 pgyw== Received: by 10.68.236.169 with SMTP id uv9mr7005884pbc.64.1337618808204; Mon, 21 May 2012 09:46:48 -0700 (PDT) Received: from bill-the-cat.ph.cox.net (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id in7sm14952395pbc.23.2012.05.21.09.46.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 May 2012 09:46:47 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 21 May 2012 09:46:33 -0700 Message-Id: <1337618793-13934-6-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337618793-13934-1-git-send-email-trini@ti.com> References: <1337618793-13934-1-git-send-email-trini@ti.com> Cc: Heiko Schocher Subject: [U-Boot] [PATCH 5/5] omap24xx_i2c: Add AM33XX 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 The same places that check for CONFIG_OMAP44XX need to check for CONFIG_AM33XX as we share the same i2c block. Cc: Heiko Schocher Signed-off-by: Tom Rini Acked-by: Heiko Schocher --- drivers/i2c/omap24xx_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 3a50417..81193b0 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -202,7 +202,7 @@ static int i2c_read_byte(u8 devaddr, u8 regoffset, u8 *value) } if (status & I2C_STAT_RRDY) { #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_OMAP44XX) + defined(CONFIG_OMAP44XX) || defined(CONFIG_AM33XX) *value = readb(&i2c_base->data); #else *value = readw(&i2c_base->data); @@ -232,7 +232,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_OMAP44XX) || defined(CONFIG_AM33XX) readb(&i2c_base->data); #else readw(&i2c_base->data); @@ -282,7 +282,7 @@ int i2c_probe(uchar chip) if (status & I2C_STAT_RRDY) { res = 0; #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ - defined(CONFIG_OMAP44XX) + defined(CONFIG_OMAP44XX) || defined(CONFIG_AM33XX) readb(&i2c_base->data); #else readw(&i2c_base->data);