From patchwork Wed Sep 4 12:54:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 2853655 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F20CC9F3DC for ; Wed, 4 Sep 2013 13:04:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DA5220303 for ; Wed, 4 Sep 2013 13:04:29 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64C2920319 for ; Wed, 4 Sep 2013 13:04:24 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHCjW-000688-KE; Wed, 04 Sep 2013 13:02:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHCj0-0004F5-Qw; Wed, 04 Sep 2013 13:02:22 +0000 Received: from tx2ehsobe003.messaging.microsoft.com ([65.55.88.13] helo=tx2outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHCiX-00048H-7i for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2013 13:01:55 +0000 Received: from mail228-tx2-R.bigfish.com (10.9.14.230) by TX2EHSOBE002.bigfish.com (10.9.40.22) with Microsoft SMTP Server id 14.1.225.22; Wed, 4 Sep 2013 13:01:36 +0000 Received: from mail228-tx2 (localhost [127.0.0.1]) by mail228-tx2-R.bigfish.com (Postfix) with ESMTP id 0E60BD800AB; Wed, 4 Sep 2013 13:01:36 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 6 X-BigFish: VS6(zcb8kzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz1de098h1de097h8275bhz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h1155h) Received: from mail228-tx2 (localhost.localdomain [127.0.0.1]) by mail228-tx2 (MessageSwitch) id 1378299693771054_10389; Wed, 4 Sep 2013 13:01:33 +0000 (UTC) Received: from TX2EHSMHS001.bigfish.com (unknown [10.9.14.236]) by mail228-tx2.bigfish.com (Postfix) with ESMTP id B824B5A0041; Wed, 4 Sep 2013 13:01:33 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS001.bigfish.com (10.9.99.101) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 4 Sep 2013 13:01:29 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 4 Sep 2013 13:01:28 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r84D138Q027984; Wed, 4 Sep 2013 06:01:26 -0700 From: Dong Aisheng To: Subject: [PATCH 8/8] ARM: dts: imx6qdl: add uhs pinctrl state for usdhc3 Date: Wed, 4 Sep 2013 20:54:17 +0800 Message-ID: <1378299257-2980-9-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1378299257-2980-1-git-send-email-b29396@freescale.com> References: <1378299257-2980-1-git-send-email-b29396@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130904_090153_464373_0F32F9A6 X-CRM114-Status: GOOD ( 10.66 ) X-Spam-Score: -4.2 (----) Cc: shawn.guo@linaro.org, s.hauer@pengutronix.de, anton@enomsg.org, cjb@laptop.org, b29396@freescale.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed for supporting ultra high speed cards like SD3.0 cards. Signed-off-by: Dong Aisheng --- arch/arm/boot/dts/imx6dl.dtsi | 33 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6q.dtsi | 33 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 ++- 3 files changed, 69 insertions(+), 1 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 2b3ecd6..e983b81 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -203,6 +203,39 @@ MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x17059 >; }; + + pinctrl_usdhc3_3: usdhc3grp-3 { /* 100Mhz */ + fsl,pins = < + MX6DL_PAD_SD3_CMD__SD3_CMD 0x170B9 + MX6DL_PAD_SD3_CLK__SD3_CLK 0x100B9 + MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x170B9 + MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x170B9 + MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x170B9 + MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x170B9 + MX6DL_PAD_SD3_DAT4__SD3_DATA4 0x170B9 + MX6DL_PAD_SD3_DAT5__SD3_DATA5 0x170B9 + MX6DL_PAD_SD3_DAT6__SD3_DATA6 0x170B9 + MX6DL_PAD_SD3_DAT7__SD3_DATA7 0x170B9 + MX6DL_PAD_GPIO_18__SD3_VSELECT 0x17059 + >; + }; + + pinctrl_usdhc3_4: usdhc3grp-4 { /* 200Mhz */ + fsl,pins = < + MX6DL_PAD_SD3_CMD__SD3_CMD 0x170F9 + MX6DL_PAD_SD3_CLK__SD3_CLK 0x100F9 + MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x170F9 + MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x170F9 + MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x170F9 + MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x170F9 + MX6DL_PAD_SD3_DAT4__SD3_DATA4 0x170F9 + MX6DL_PAD_SD3_DAT5__SD3_DATA5 0x170F9 + MX6DL_PAD_SD3_DAT6__SD3_DATA6 0x170F9 + MX6DL_PAD_SD3_DAT7__SD3_DATA7 0x170F9 + MX6DL_PAD_GPIO_18__SD3_VSELECT 0x17059 + >; + }; + }; weim { diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index ba09dc3..a63b623 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -337,6 +337,39 @@ MX6Q_PAD_SD3_DAT3__SD3_DATA3 0x17059 >; }; + + pinctrl_usdhc3_3: usdhc3grp-3 { /* 100Mhz */ + fsl,pins = < + MX6Q_PAD_SD3_CMD__SD3_CMD 0x170B9 + MX6Q_PAD_SD3_CLK__SD3_CLK 0x100B9 + MX6Q_PAD_SD3_DAT0__SD3_DATA0 0x170B9 + MX6Q_PAD_SD3_DAT1__SD3_DATA1 0x170B9 + MX6Q_PAD_SD3_DAT2__SD3_DATA2 0x170B9 + MX6Q_PAD_SD3_DAT3__SD3_DATA3 0x170B9 + MX6Q_PAD_SD3_DAT4__SD3_DATA4 0x170B9 + MX6Q_PAD_SD3_DAT5__SD3_DATA5 0x170B9 + MX6Q_PAD_SD3_DAT6__SD3_DATA6 0x170B9 + MX6Q_PAD_SD3_DAT7__SD3_DATA7 0x170B9 + MX6Q_PAD_GPIO_18__SD3_VSELECT 0x17059 + >; + }; + + pinctrl_usdhc3_4: usdhc3grp-4 { /* 200Mhz */ + fsl,pins = < + MX6Q_PAD_SD3_CMD__SD3_CMD 0x170F9 + MX6Q_PAD_SD3_CLK__SD3_CLK 0x100F9 + MX6Q_PAD_SD3_DAT0__SD3_DATA0 0x170F9 + MX6Q_PAD_SD3_DAT1__SD3_DATA1 0x170F9 + MX6Q_PAD_SD3_DAT2__SD3_DATA2 0x170F9 + MX6Q_PAD_SD3_DAT3__SD3_DATA3 0x170F9 + MX6Q_PAD_SD3_DAT4__SD3_DATA4 0x170F9 + MX6Q_PAD_SD3_DAT5__SD3_DATA5 0x170F9 + MX6Q_PAD_SD3_DAT6__SD3_DATA6 0x170F9 + MX6Q_PAD_SD3_DAT7__SD3_DATA7 0x170F9 + MX6Q_PAD_GPIO_18__SD3_VSELECT 0x17059 + >; + }; + }; usdhc4 { diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index e994011..c2c4d85 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -52,8 +52,10 @@ }; &usdhc3 { - pinctrl-names = "default"; + pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc3_1>; + pinctrl-1 = <&pinctrl_usdhc3_3>; + pinctrl-2 = <&pinctrl_usdhc3_4>; cd-gpios = <&gpio6 15 0>; wp-gpios = <&gpio1 13 0>; status = "okay";