From patchwork Wed Aug 28 03:17:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chaiken, Alison" X-Patchwork-Id: 2850515 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A6F65BF546 for ; Wed, 28 Aug 2013 03:19:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C564820378 for ; Wed, 28 Aug 2013 03:19:05 +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 AD8B220377 for ; Wed, 28 Aug 2013 03:19:04 +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 1VEWHQ-0006X1-K8; Wed, 28 Aug 2013 03:18:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEWHI-0005gX-Oi; Wed, 28 Aug 2013 03:18:40 +0000 Received: from relay1.mentorg.com ([192.94.38.131]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEWH5-0005e8-Hc for linux-arm-kernel@lists.infradead.org; Wed, 28 Aug 2013 03:18:29 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VEWGf-0003Hd-KA from Alison_Chaiken@mentor.com ; Tue, 27 Aug 2013 20:18:01 -0700 Received: from NA1-MAIL.mgc.mentorg.com ([147.34.98.181]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 27 Aug 2013 20:18:02 -0700 Received: from sb-ubuntu-1204-64bit.alm.mentorg.com ([134.86.97.18]) by NA1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 27 Aug 2013 20:18:01 -0700 From: alison_chaiken@mentor.com To: linus.walleij@linaro.org Subject: [PATCH 2/2] i.MX6: Documentation: Change fsl, imx-pinctrl.txt to match i.MX6 TRM Date: Tue, 27 Aug 2013 20:17:35 -0700 Message-Id: <1377659855-9573-3-git-send-email-alison_chaiken@mentor.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377659855-9573-1-git-send-email-alison_chaiken@mentor.com> References: <521C40D9.3070802@freescale.com> <1377659855-9573-1-git-send-email-alison_chaiken@mentor.com> X-OriginalArrivalTime: 28 Aug 2013 03:18:01.0190 (UTC) FILETIME=[33A3F860:01CEA39D] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130827_231827_683638_31986142 X-CRM114-Status: UNSURE ( 7.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: devicetree@vger.kernel.org, alison@she-devel.com, rob.herring@calxeda.com, b32955@freescale.com, olof@lixom.net, alison_chaiken@mentor.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: , MIME-Version: 1.0 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.7 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 From: Alison Chaiken Update documentation file fsl,imx-pinctrl.txt to match iomuxc pinctrl config settings to reflect Rev. 1 (4/2013) of IMX6DQRM, i.MX6 technical reference manual. Signed-off-by: Alison Chaiken --- .../bindings/pinctrl/fsl,imx-pinctrl.txt | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt index 3a7caf7..9b347f1 100644 --- a/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt @@ -72,23 +72,24 @@ iomuxc@020e0000 { /* shared pinctrl settings */ usdhc4 { pinctrl_usdhc4_1: usdhc4grp-1 { - fsl,pins = <1386 0x17059 /* MX6Q_PAD_SD4_CMD__USDHC4_CMD */ + fsl,pins = <1386 0x1b0b0 /* MX6Q_PAD_SD4_CMD__USDHC4_CMD */ 1392 0x10059 /* MX6Q_PAD_SD4_CLK__USDHC4_CLK */ - 1462 0x17059 /* MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 */ - 1470 0x17059 /* MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 */ - 1478 0x17059 /* MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 */ - 1486 0x17059 /* MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 */ - 1493 0x17059 /* MX6Q_PAD_SD4_DAT4__USDHC4_DAT4 */ - 1501 0x17059 /* MX6Q_PAD_SD4_DAT5__USDHC4_DAT5 */ - 1509 0x17059 /* MX6Q_PAD_SD4_DAT6__USDHC4_DAT6 */ - 1517 0x17059>; /* MX6Q_PAD_SD4_DAT7__USDHC4_DAT7 */ + 1462 0x1b0b0 /* MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 */ + 1470 0x1b0b0 /* MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 */ + 1478 0x1b0b0 /* MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 */ + 1486 0x1b0b0 /* MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 */ + 1493 0x1b0b0 /* MX6Q_PAD_SD4_DAT4__USDHC4_DAT4 */ + 1501 0x1b0b0 /* MX6Q_PAD_SD4_DAT5__USDHC4_DAT5 */ + 1509 0x1b0b0 /* MX6Q_PAD_SD4_DAT6__USDHC4_DAT6 */ + 1517 0x1b0b0>; /* MX6Q_PAD_SD4_DAT7__USDHC4_DAT7 */ }; }; .... }; -Refer to the IOMUXC controller chapter in imx6q datasheet, -0x17059 means enable hysteresis, 47KOhm Pull Up, 50Mhz speed, -80Ohm driver strength and Fast Slew Rate. +Referring to "Pin Assignments" Table of "i.MX 6Dual/6Quad Applications Processor +Reference Manual, Rev. 1, 04/2013", +0x1b0b0 means enable hysteresis, 100KOhm Pull Up, 100Mhz speed, +40Ohm driver strength and Slow Slew Rate. User should refer to each SoC spec to set the correct value. TODO: when dtc macro support is available, we can change above raw data