From patchwork Fri Nov 5 05:53:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 71997 X-Patchwork-Delegate: s-paulraj@ti.com Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id B23C2EA47F for ; Fri, 5 Nov 2010 06:54:59 +0100 (CET) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 9CA413335219 for ; Fri, 5 Nov 2010 06:54:59 +0100 (CET) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.17) for (single-drop); Fri, 05 Nov 2010 06:54:59 +0100 (CET) Received: from murder ([192.168.8.180]) by backend2 (Cyrus v2.2.12) with LMTPA; Fri, 05 Nov 2010 06:54:14 +0100 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend1.mail.m-online.net (Cyrus v2.2.12) with LMTPA; Fri, 05 Nov 2010 06:54:14 +0100 Received: from scanner-2.m-online.net (scanner-2.mail.m-online.net [192.168.8.166]) by mail.m-online.net (Postfix) with ESMTP id 67E4B1C001B5; Fri, 5 Nov 2010 06:54:14 +0100 (CET) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-2.m-online.net (Postfix) with ESMTP id 765A6468D85; Fri, 5 Nov 2010 06:54:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03CBD280A6; Fri, 5 Nov 2010 06:54:11 +0100 (CET) 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 lfFqfR9RfQFB; Fri, 5 Nov 2010 06:54:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BFB66280AB; Fri, 5 Nov 2010 06:54:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D92B28083 for ; Fri, 5 Nov 2010 06:54:02 +0100 (CET) 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 V2u5Ka-julC0 for ; Fri, 5 Nov 2010 06:54:00 +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-qw0-f44.google.com (mail-qw0-f44.google.com [209.85.216.44]) by theia.denx.de (Postfix) with ESMTP id 0574C28081 for ; Fri, 5 Nov 2010 06:53:58 +0100 (CET) Received: by qwb7 with SMTP id 7so2010379qwb.3 for ; Thu, 04 Nov 2010 22:53:58 -0700 (PDT) Received: by 10.229.215.6 with SMTP id hc6mr1578827qcb.133.1288936438371; Thu, 04 Nov 2010 22:53:58 -0700 (PDT) Received: from localhost.localdomain (ec2-75-101-156-174.compute-1.amazonaws.com [75.101.156.174]) by mx.google.com with ESMTPS id t35sm934440qco.18.2010.11.04.22.53.57 (version=SSLv3 cipher=RC4-MD5); Thu, 04 Nov 2010 22:53:57 -0700 (PDT) From: Jason Kridner To: u-boot@lists.denx.de, beagleboard@googlegroups.com Date: Fri, 5 Nov 2010 00:53:57 -0500 Message-Id: <1288936437-30671-1-git-send-email-jkridner@beagleboard.org> X-Mailer: git-send-email 1.5.6.4 Cc: Steve Kipisz Subject: [U-Boot] [PATCH] ARMV7: OMAP3: BeagleBoard: Enable pullups on i2c2. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 X-Virus-Scanned: by amavisd-new at m-online.net From: Steve Kipisz Signed-off-by: Jason Kridner --- arch/arm/include/asm/arch-omap3/omap3.h | 9 +++++++++ board/ti/beagle/beagle.c | 3 +++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h index 3957c79..1860dff 100644 --- a/arch/arm/include/asm/arch-omap3/omap3.h +++ b/arch/arm/include/asm/arch-omap3/omap3.h @@ -50,6 +50,15 @@ /* CONTROL */ #define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000) +/* Signal Integrity Parameter Control Registers */ +#define CONTROL_PROG_IO0 0x48002444 +#define CONTROL_PROG_IO1 0x48002448 +#define CONTROL_PROG_IO2 0x48002408 +#define CONTROL_PROG_IO_WKUP1 0x48002A80 + +/* Bit definition for CONTROL_PROG_IO1 */ +#define PRG_I2C2_PULLUPRESX 0x00000001 + /* UART */ #define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE + 0x6a000) #define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE + 0x6c000) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index dd7b6b5..6074eca 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -160,6 +160,9 @@ int misc_init_r(void) struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; + /* Enable i2c2 pullup resisters */ + *(ulong *)(CONTROL_PROG_IO1) &= ~(PRG_I2C2_PULLUPRESX); + switch (get_board_revision()) { case REVISION_AXBX: printf("Beagle Rev Ax/Bx\n");