From patchwork Wed Sep 12 22:10:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 183463 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 6DC742C00A0 for ; Thu, 13 Sep 2012 08:13:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 787C7280AA; Thu, 13 Sep 2012 00:12:58 +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 G7Do7-+Zof6q; Thu, 13 Sep 2012 00:12:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 19209280AB; Thu, 13 Sep 2012 00:12:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7949E280AA for ; Thu, 13 Sep 2012 00:12:25 +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 8OIX1CDgeJzx for ; Thu, 13 Sep 2012 00:12:25 +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 52E4E2808D for ; Thu, 13 Sep 2012 00:12:07 +0200 (CEST) Received: by dadf8 with SMTP id f8so1291326dad.3 for ; Wed, 12 Sep 2012 15:12:04 -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:in-reply-to:references :x-nvconfidentiality; bh=06BJOeFqvuPfW74SEtqfdh/4bU4IRgNAqFyhaFLTWeA=; b=osBvvJDLnVu0cHOZW7+NXMrm2REC40H4Smr1I7PVWN6tkwr0pH/IWSLjoAHI64exrK 8yL4EVSVRBLXqHFdp5bWJdH4TxUwnGdi2B00NUWQslJembKnYlJDpo5Ta5eDSYXXND7a /sZcnSRpE0fiPRAWPK9VXAIV7Vc8ttG9JUIHApc4XhtLumyumndPUwiPVKIkl3T2jT3/ Sc8q5xKP2QDuN5nC8V4X48uclKRmOcHoiAub5HvmuayJgYnjij7+N9gskhe3hyROBelK E+tVCvcZKzLlxBpUtSsQynIB7UBV0dZdhS4QYL2w0LMkCJxwAZT5q5jOOonRcVMlAG2l xf+w== Received: by 10.68.240.138 with SMTP id wa10mr875416pbc.145.1347487924924; Wed, 12 Sep 2012 15:12:04 -0700 (PDT) Received: from localhost.localdomain (ip68-230-103-25.ph.ph.cox.net. [68.230.103.25]) by mx.google.com with ESMTPS id gt2sm12041999pbc.62.2012.09.12.15.12.02 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 15:12:04 -0700 (PDT) From: Tom Warren To: u-boot@lists.denx.de Date: Wed, 12 Sep 2012 15:10:54 -0700 Message-Id: <1347487855-27077-9-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1347487855-27077-1-git-send-email-twarren@nvidia.com> References: <1347487855-27077-1-git-send-email-twarren@nvidia.com> X-NVConfidentiality: public Cc: swarren@nvidia.com, Tom Warren , trini@ti.com, twarren.nvidia@gmail.com Subject: [U-Boot] [PATCH 8/9] Tegra30: Add common pinmux config in board_early_init_f 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 Signed-off-by: Tom Warren --- board/nvidia/common/board.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index afe832a..4a86c30 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010,2011 + * (C) Copyright 2010-2012 * NVIDIA Corporation * * See file CREDITS for list of people who contributed to this @@ -25,7 +25,11 @@ #include #include #include +#if defined(CONFIG_TEGRA20) #include +#else /* Tegra30 */ +#include +#endif #include #include @@ -87,6 +91,25 @@ static void power_det_init(void) #endif } +#ifdef CONFIG_TEGRA30 +#include "../cardhu/pinmux-config-common.h" +#endif + +/* + * Routine: pinmux_init + * Description: Do individual peripheral pinmux configs + */ +static void pinmux_init(void) +{ +#if defined(CONFIG_TEGRA30) + pinmux_config_table(tegra3_pinmux_common, + ARRAY_SIZE(tegra3_pinmux_common)); + + pinmux_config_table(unused_pins_lowpower, + ARRAY_SIZE(unused_pins_lowpower)); +#endif +} + /* * Routine: board_init * Description: Early hardware init. @@ -152,6 +175,8 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init"))); int board_early_init_f(void) { + pinmux_init(); + board_init_uart_f(); /* Initialize periph GPIOs */