From patchwork Tue Apr 17 18:50:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 153275 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 B42BFB70E0 for ; Wed, 18 Apr 2012 04:51:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0599D280C2; Tue, 17 Apr 2012 20:51: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 CuoggZpJ6y13; Tue, 17 Apr 2012 20:51:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51ADE280A0; Tue, 17 Apr 2012 20:50:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A81B2808B for ; Tue, 17 Apr 2012 20:50:49 +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 PIsdpNFLOy-h for ; Tue, 17 Apr 2012 20:50:48 +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-qa0-f74.google.com (mail-qa0-f74.google.com [209.85.216.74]) by theia.denx.de (Postfix) with ESMTPS id 8076728083 for ; Tue, 17 Apr 2012 20:50:46 +0200 (CEST) Received: by qabg24 with SMTP id g24so104571qab.3 for ; Tue, 17 Apr 2012 11:50:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=xiuc4jkqNpt9G5OM0Ge92uC8AQslBu5cE0TPpYORBzU=; b=ZBv20S+2Sz+Y7yKLR5NGJz69LgGalccChmrWPmZoy1ST8x4itzTXErWIwMpxFPpEJT mctL95LbzcqcAp4hWUhSGpPWm38QCaoED3t9TelC5++iu0jYrWr+QTtDU+rF8REONcrR rAqAzO5TLo8+FF6VZBr4Av2o3V4O3jOR0fHwc4a/mm+5cJpLNTlXFO2wbu6AOA5uoR4f DkFn7cmEmyAv2USM2Hp6p6xPbBddJSUXbG9hJFpP+3j7jha94Fg7fRTwHEKHLg/uq3V4 BdxKnuj5/fV4P+4/jiDf2gZHzTCMIQY9wxr6ywB+v2R9tPRB84LWg9UJpBDVmGb++zHr o6iw== Received: by 10.236.153.5 with SMTP id e5mr21893812yhk.5.1334688645905; Tue, 17 Apr 2012 11:50:45 -0700 (PDT) Received: by 10.236.153.5 with SMTP id e5mr21893790yhk.5.1334688645832; Tue, 17 Apr 2012 11:50:45 -0700 (PDT) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id r32si8599070ano.1.2012.04.17.11.50.45 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 17 Apr 2012 11:50:45 -0700 (PDT) Received: from sglass.mtv.corp.google.com (dhcp-172-22-162-38.mtv.corp.google.com [172.22.162.38]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id B62171E0058; Tue, 17 Apr 2012 11:50:45 -0700 (PDT) Received: by sglass.mtv.corp.google.com (Postfix, from userid 121222) id 6B4CA140ED3; Tue, 17 Apr 2012 11:50:45 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 17 Apr 2012 11:50:10 -0700 Message-Id: <1334688614-4977-4-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1334688614-4977-1-git-send-email-sjg@chromium.org> References: <1334688614-4977-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQnGxj6hgsYujtwnZqAteHeFC8+H/1o0bO4D5B8C6LSWQ5M7OXW1BPZQgRvSA/PZ7ar8/jirBf1UWoXlHne26wGii77k61s3chBXLD5kz3kX4rLaOdb2hWOIUdambI0W+/6BD3lthQ6ARYZNFsY7GpwwOS7LLlCYMrmM3v9B/btsOaXOPa0= Cc: Scott Wood , Tom Warren Subject: [U-Boot] [PATCH v3 3/7] tegra: Add NAND support to funcmux 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 Add selection of NAND flash pins to the funcmux. Signed-off-by: Simon Glass Acked-by: Stephen Warren --- arch/arm/cpu/armv7/tegra2/funcmux.c | 7 +++++++ arch/arm/include/asm/arch-tegra2/funcmux.h | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c b/arch/arm/cpu/armv7/tegra2/funcmux.c index c1d2dfe..8931d5e 100644 --- a/arch/arm/cpu/armv7/tegra2/funcmux.c +++ b/arch/arm/cpu/armv7/tegra2/funcmux.c @@ -169,6 +169,13 @@ int funcmux_select(enum periph_id id, int config) } break; + case PERIPH_ID_NDFLASH: + if (config == FUNCMUX_NDFLASH_ATC) { + pinmux_set_func(PINGRP_ATC, PMUX_FUNC_NAND); + pinmux_tristate_disable(PINGRP_ATC); + } + break; + default: debug("%s: invalid periph_id %d", __func__, id); return -1; diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h b/arch/arm/include/asm/arch-tegra2/funcmux.h index ae73c72..9419522 100644 --- a/arch/arm/include/asm/arch-tegra2/funcmux.h +++ b/arch/arm/include/asm/arch-tegra2/funcmux.h @@ -47,6 +47,9 @@ enum { FUNCMUX_SDMMC4_ATC_ATD_8BIT = 0, FUNCMUX_SDMMC4_ATB_GMA_4_BIT, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT, + + /* NAND flags */ + FUNCMUX_NDFLASH_ATC = 0, }; /**