From patchwork Wed Mar 30 01:53:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 64633 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2335288lbc; Tue, 29 Mar 2016 18:52:36 -0700 (PDT) X-Received: by 10.194.24.39 with SMTP id r7mr5783132wjf.86.1459302756891; Tue, 29 Mar 2016 18:52:36 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id t7si1981125wjw.138.2016.03.29.18.52.36; Tue, 29 Mar 2016 18:52:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 64A8CA76BE; Wed, 30 Mar 2016 03:52:36 +0200 (CEST) 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 5GLQH5Rxv67x; Wed, 30 Mar 2016 03:52:36 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C44E2A76AE; Wed, 30 Mar 2016 03:52:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC7BCA76B5 for ; Wed, 30 Mar 2016 03:52:32 +0200 (CEST) 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 YUaxIUUfsYHN for ; Wed, 30 Mar 2016 03:52:32 +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 conuserg009-v.nifty.com (conuserg009.nifty.com [202.248.44.35]) by theia.denx.de (Postfix) with ESMTPS id 06C4EA7646 for ; Wed, 30 Mar 2016 03:52:28 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg009-v.nifty.com with ESMTP id u2U1qKfm025063; Wed, 30 Mar 2016 10:52:20 +0900 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 30 Mar 2016 10:53:15 +0900 Message-Id: <1459302795-13839-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] ARM: uniphier: add pin-mux settings for NAND, eMMC, SD of PH1-sLD3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c index 367d9f3..f85ed53 100644 --- a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c +++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c @@ -22,4 +22,27 @@ void ph1_sld3_pin_init(void) sg_set_pinsel(19, 0, 4, 4); /* USB3OC */ sg_set_pinsel(20, 1, 4, 4); /* USB3VBUS */ #endif + +#ifdef CONFIG_NAND_DENALI + sg_set_pinsel(38, 1, 4, 4); /* NFALE_GB, NFCLE_GB */ + sg_set_pinsel(39, 1, 4, 4); /* XNFRYBY0_GB */ + sg_set_pinsel(40, 1, 4, 4); /* XNFCE0_GB, XNFRE_GB, XNFWE_GB, XNFWP_GB */ + sg_set_pinsel(41, 1, 4, 4); /* XNFRYBY1_GB, XNFCE1_GB */ + sg_set_pinsel(58, 1, 4, 4); /* NFD[0-3]_GB */ + sg_set_pinsel(59, 1, 4, 4); /* NFD[4-7]_GB */ +#endif + +#ifdef CONFIG_MMC_UNIPHIER + /* eMMC */ + sg_set_pinsel(55, 1, 4, 4); /* XERST */ + sg_set_pinsel(56, 1, 4, 4); /* MMCDAT[0-3] */ + sg_set_pinsel(57, 1, 4, 4); /* MMCDAT[4-7] */ + sg_set_pinsel(60, 1, 4, 4); /* MMCCLK, MMCCMD */ + + /* SD card */ + sg_set_pinsel(42, 1, 4, 4); /* SD1CLK, SD1CMD, SD1DAT[0-3] */ + sg_set_pinsel(43, 1, 4, 4); /* SD1CD */ + sg_set_pinsel(44, 1, 4, 4); /* SD1WP */ + sg_set_pinsel(45, 1, 4, 4); /* SDVTCG */ +#endif }