From patchwork Thu Mar 22 23:49:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Gra=C5=BEvydas_Ignotas?= X-Patchwork-Id: 148357 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 57A96B6FA1 for ; Fri, 23 Mar 2012 10:49:47 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9E54F280A7; Fri, 23 Mar 2012 00:49:43 +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 9+fU5ZblGz8P; Fri, 23 Mar 2012 00:49:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A2D5828096; Fri, 23 Mar 2012 00:49:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 98E8D28096 for ; Fri, 23 Mar 2012 00:49:36 +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 A+RKqrkQnjIe for ; Fri, 23 Mar 2012 00:49:34 +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-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by theia.denx.de (Postfix) with ESMTPS id 505BA28094 for ; Fri, 23 Mar 2012 00:49:31 +0100 (CET) Received: by wgbgn7 with SMTP id gn7so2027936wgb.9 for ; Thu, 22 Mar 2012 16:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4GIxBUu36gIoas6iC0/GB2NzmZmIImmnhcmUSbe3Gtw=; b=eF0e68kWL6gJx8P0AVfH/cPVt8qAwLgjH8s2mRvEVmkzXEnOh2zLwXJqk24zDeZAnS GdNinVvh95uDmSfsaiwGUSlypTTcsSA/06ZKMm/CaFbQZb7fsctYs1mhg68AzWFM3UQQ U0nY2/kHxOtoJn89ehpggT67yOBdyYrMf2CynvAnbcLe6iD/L+IQpv4KXR1A4xWqc7hE b3DuZnOdfQ6IPQDt0gzbi62rzPTupRSK3AN1f0kp7onNIj5h6x8wleixIpU6+xohDoBY 3n0AWEu5E9XXgjaHcHk8FY0NfOqHjWsmv68kdE23t1YhWyHqLajzpeErw3+aXWG+4OYm X2Sw== Received: by 10.216.144.210 with SMTP id n60mr7146383wej.5.1332460169654; Thu, 22 Mar 2012 16:49:29 -0700 (PDT) Received: from localhost.localdomain (ip-88-119-226-136.static.b4net.lt. [88.119.226.136]) by mx.google.com with ESMTPS id n15sm9200409wiw.6.2012.03.22.16.49.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 16:49:28 -0700 (PDT) From: Grazvydas Ignotas To: u-boot@lists.denx.de Date: Fri, 23 Mar 2012 01:49:21 +0200 Message-Id: <1332460163-30070-1-git-send-email-notasas@gmail.com> X-Mailer: git-send-email 1.7.0.4 Cc: Tom Rini Subject: [U-Boot] [PATCH] OMAP3: pandora: pin mux updates for DM3730 board variant 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 DM3730 needs some additional pin mux configuration for GPIOs 126-129 to work, add it. Signed-off-by: Grazvydas Ignotas --- arch/arm/include/asm/arch-omap3/mux.h | 6 ++++++ board/pandora/pandora.c | 3 +++ board/pandora/pandora.h | 6 ++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h index 6daef49..71f183d 100644 --- a/arch/arm/include/asm/arch-omap3/mux.h +++ b/arch/arm/include/asm/arch-omap3/mux.h @@ -445,6 +445,12 @@ #define CONTROL_PADCONF_STRBEN_DLY1 0x0224 #define CONTROL_PADCONF_SYS_BOOT8 0x0226 +/* AM/DM37xx specific */ +#define CONTROL_PADCONF_GPIO127 0x0A54 +#define CONTROL_PADCONF_GPIO126 0x0A56 +#define CONTROL_PADCONF_GPIO128 0x0A58 +#define CONTROL_PADCONF_GPIO129 0x0A5A + #define MUX_VAL(OFFSET,VALUE)\ writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET)); diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c index 58a676d..70d2d82 100644 --- a/board/pandora/pandora.c +++ b/board/pandora/pandora.c @@ -103,6 +103,9 @@ int misc_init_r(void) void set_muxconf_regs(void) { MUX_PANDORA(); + if (get_cpu_family() == CPU_OMAP36XX) { + MUX_PANDORA_3730(); + } } #ifdef CONFIG_GENERIC_MMC diff --git a/board/pandora/pandora.h b/board/pandora/pandora.h index f0ad16b..fea8bf2 100644 --- a/board/pandora/pandora.h +++ b/board/pandora/pandora.h @@ -399,4 +399,10 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ +#define MUX_PANDORA_3730() \ + MUX_VAL(CP(GPIO126), (IEN | PTD | DIS | M4)) /*GPIO_126 - MMC1_WP*/\ + MUX_VAL(CP(GPIO127), (IEN | PTD | DIS | M4)) /*GPIO_127 - MMC2_WP*/\ + MUX_VAL(CP(GPIO128), (IDIS | PTD | DIS | M4)) /*GPIO_128 - LED_MMC1*/\ + MUX_VAL(CP(GPIO129), (IDIS | PTD | DIS | M4)) /*GPIO_129 - LED_MMC2*/ + #endif