From patchwork Mon Jun 29 13:05:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 6688971 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B49F19F3D1 for ; Mon, 29 Jun 2015 13:13:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC3C72052A for ; Mon, 29 Jun 2015 13:13:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F160720520 for ; Mon, 29 Jun 2015 13:13:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z9Ypw-00064G-G9; Mon, 29 Jun 2015 13:11:00 +0000 Received: from mail-bn1bbn0103.outbound.protection.outlook.com ([157.56.111.103] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z9YlQ-0002Rm-VA for linux-arm-kernel@lists.infradead.org; Mon, 29 Jun 2015 13:06:22 +0000 Received: from DM2PR03CA0036.namprd03.prod.outlook.com (10.141.96.35) by BLUPR03MB245.namprd03.prod.outlook.com (10.255.213.13) with Microsoft SMTP Server (TLS) id 15.1.207.12; Mon, 29 Jun 2015 13:05:57 +0000 Received: from BN1BFFO11FD008.protection.gbl (2a01:111:f400:7c10::1:172) by DM2PR03CA0036.outlook.office365.com (2a01:111:e400:2428::35) with Microsoft SMTP Server (TLS) id 15.1.201.16 via Frontend Transport; Mon, 29 Jun 2015 13:05:57 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD008.mail.protection.outlook.com (10.58.144.71) with Microsoft SMTP Server (TLS) id 15.1.201.10 via Frontend Transport; Mon, 29 Jun 2015 13:05:57 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.45]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t5TD5rp2030699; Mon, 29 Jun 2015 06:05:53 -0700 From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 1/2] ARM: dts: imx6sl-warp: Add changes for rev1.12 Date: Mon, 29 Jun 2015 10:05:42 -0300 Message-ID: <1435583143-4734-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD008; 1:CgN/5LG9SK0cUjPHrwsrqMntbFrYykGDB7Xb7MV0LWFdvxI7EHDrMbz1K/dbZ8wwROfFhlrfF18VIdam0KD2A2TMWlLJNS3Zn42yx58E7fMeupsMW5UbYQVnlmGCdPsKaBMaMP94SxA4irwUWkidBY+YI+iue+rXqAHPiaOI3hQ5oa3+m04bfUMXCkg2cyXzR0LJdP/BAWoEHqQfcOtONvZH+TxDyKzfs3Cpya/c6mG2wkFquJYw1AwUq5qDwrlRbjAJUtpaFJWi28R8jYcOH2g/kbP2Xbg2RORNGd98O3v/SMi1RjwzF8xGsIIAoRUDMbGTBwUHZq7Z4gNWZuuXgQ== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(47776003)(2361001)(33646002)(85426001)(19580395003)(19580405001)(36756003)(104016003)(6806004)(50466002)(77096005)(48376002)(50226001)(62966003)(77156002)(107886002)(5001960100002)(110136002)(189998001)(46102003)(106466001)(92566002)(50986999)(86362001)(2351001)(229853001)(105606002)(87936001)(575784001)(32563001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB245; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB245; 2:Mq+4CGImM+ydgoURCX1UARpP8GbTtWiltrPQqya+C1xhrTSOoF+Eha82tPAgh0iF; 3:CUBq90tCDMPye6rdKOrysyjNRdXZH+Q5m4Mn1W59PLCsznJ0xV2oKB/yk5yvFav4f5fhlC5iKvqdG3212fgeYJrtxitS/paAV2Gi0yRlR3YidIhv8F2H+bPX/7weqv42Eo5Xbj5fX3OoxaWBSfPNJIeS5WfrZbwsYn9n+IXZu++8HGLimvggz4D9zwkbIqAmOKYQY2z37BtylC9+uF7virPJv6H/NUjM1bv7mKQWRi8=; 25:9dNHi3Wdh2b1foZv8OMETGzWh79YUX62KJcfPuciLSPHWgapxdnm1axulyhmKO6DICIWA/4U6czWpZVeg3G4fO3nx4DzdSc6vclJNOf95vIM93gcxyvX4CIWNbXN3juVfeyLD6zF8pLaArB2oceOvK+sHegUl+hedO/FUQs1FQ64Qc4uddOnEzUz/bPHsN3E3R10fOf0OPbmswnEKkxOx0fSDVsiVrAGC9PbTq6JvCO1/bZIt7phG8HqisqSdQRixVpnOtQ3uoyJ0gwrL6wTLQ==; 20:ynlNWDRhXYJfrQHNhjS40bNKnTooIkOywIc5EJqqT9hwRZLox5nKnqFcdHiHNZ3KCclznPjJ+RDASw4Fn1ojLkc4WY++0NygVfEZml7XqFHAIBtf7VNyfTySxFfuv6B1AV5/a2qRKz42m5iL6GaxQgTvVmK9LJbodMQekm22O/YzE1F4WuXysz4MgakZxn0fEHd7sd+l7bpMdSKt0aqL4w18pT7wFDg0FK5RxG3vmoYEsVHcDJ1tD3EyywWfnZSawfAYQZrPoUldcLX2q5BBHX39yDGXhe0/lf/zt1h1SeaPUuncvdwIyGvjFxzLNGbl+wSeda30UKR+e+TAnTf4LkmotrLCHd6TM0R1W38HNlw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB245; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BLUPR03MB245; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB245; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB245; 4:V21dLCrIvdG49J5pQg9FR3grnP30OhL49Yl2VliVZ8iRNQUU3wtA7+SY1CionFiLnMKf2SVjXJFGKp3EEZOb9X0c7ZFVPGeyI2y0lgZKjhZSZIe8mQQyajU7/+7IoEAnJeMgQ71hYEi3KNVZykaC6PaPjZqwz0DcZzYTvV4CcQO280fKnhtC+t2oTvDxOdRgUNwJD6TtBOKZ1Oz0AM7cHmDkM716skCuOZL6OFlrsBKzwkeqT6vkoQSOPGN1MKrvZvBNTOzKVmhGv40FI3UQNrKn8YcyV+MexHm4zqmuSmM= X-Forefront-PRVS: 0622A98CD5 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB245; 23:Q9nTF6+FqtvS9+980dqJu9EXJPGXuSnApVNPcmQjrNS+qJ7icxHXcYorE4PuUK1jaW/TfaVt1+gjtI/9ag4jng8GGg7BSfknVHfalnIRGwi1ilLyXYp5zVxQtlFZ66SZf5X1Kc3av6mvFAVEuTxutD3yxVDZL/oe1xgIqvUA7uAuPVwQjagfrvvBX9Ao4RBkaqFQjcGbgc+CERFbV1QZ6Crko4dkPSPRbmDlaafT0aL+MU8QikxIhpEmG8LD6NXaOga61akPksnmGBDLQHAeA3CFnjfJTjm5Js9jFuu342G9cPaUSAdpNkhVxKN7ktnkKDDwnRc5h096bt/GpNOv1LAUqJ3P1UlHYObKYTq/VDVhRf6VqNt0SlEDYGZFEr2MgzUS1hX5iWWwxinp2k1+NYMPbeDgT7hNrZVejZneZU3yPV23lXYjuGBa//JCZgiQJzpzPP83/GcB+Ua1j0rfIgMo9aVNzEA9tYDXgru3BS/6snl7PD8F6FwBHe2LVbrazkxU9Cefj8MRgMtvdyLr2vHTKaTk6g/OkvYD6GAgHL7ibzAXz1DzRwOdfYi/vPKe5iN5dm4SZA411G6grv9WfnHjJB4SJBnotSw84rEb+cz/04kElazLYhB/uTJ2IPWBg7zGi382AOgI2w3a/6UK80hcQ2H4K3TuLzW4BxLl/1oD5fKqvg1gbmRIJyftTTXwFaFEvzvodBW1PlhOV+reP/wSJXufg6xzlgzavf1pgejB/oqU1BkD6OAMRl/g7t/NUBpFDNd8ycIJOX0AcQ4GHmMsxes1eS9eOMBpu6EfoZ1+xja0UNLQhaDiIZRiiIjGgtrSActr8CjrfJPhGtFfzDzqre3LNxghkkBEZ87XutMYl3C/0NC0Ciagf/Nq28isSoT2/bRHyQkjH10SrtO1Hur4CsHWK0ESqIxwCJpfQoO5lz408fwSZvlavHMNXrnA X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB245; 5:0udYzv2qoA3KXdHZGg702iBPbYELXmWTVLIO6l5o5lRsOp3m4sScqq3KRGiIr50fyYi0NZ2obcyNxjD9saQa2qmU7gEgU9q3W0bMa2l7hd/UmHfrat0McfgP/cMbmRntxpoEujp4RBiuhcpVei1/dg==; 24:l/VSWMA0WJ3zOVhSSrcn943QWrGh+RgG2MXb5NRGSdHXej8SEIMGd6bpCbt4fFzmLLhQ9fT7Sf7iXo0+SEeu4Tt6Dlm4sU2Va7HFsDfaNqo=; 20:ejLEzoltKdTqVIR5pgrypmUaM3HbSO7WlI6i3au5R2hCv/Wg5KQR3qsJUf0rpub10RXmatLR9ysBtLxFvRwW6g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2015 13:05:57.2385 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB245 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150629_060621_705059_FD6EE303 X-CRM114-Status: GOOD ( 18.39 ) X-Spam-Score: -1.9 (-) Cc: Fabio Estevam , arthur@dreem.com, otavio@ossystems.com.br, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-4.8 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 Warp board rev1.12 is the version of the hardware that will be publicly available for the customers. It uses UART5 as the Bluetooth serial port as well as some additional signals for HOSTWAKE on Wifi and Bluetooth. Make the changes to support the rev1.12 hardware. Signed-off-by: Fabio Estevam Acked-by: Otavio Salvador --- arch/arm/boot/dts/imx6sl-warp.dts | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts index 401a6b3..10c6996 100644 --- a/arch/arm/boot/dts/imx6sl-warp.dts +++ b/arch/arm/boot/dts/imx6sl-warp.dts @@ -61,7 +61,9 @@ usdhc3_pwrseq: usdhc3_pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>, /* WL_REG_ON */ + <&gpio4 7 GPIO_ACTIVE_LOW>, /* WL_HOSTWAKE */ <&gpio3 25 GPIO_ACTIVE_LOW>, /* BT_REG_ON */ + <&gpio3 27 GPIO_ACTIVE_LOW>, /* BT_HOSTWAKE */ <&gpio4 4 GPIO_ACTIVE_LOW>, /* BT_WAKE */ <&gpio4 6 GPIO_ACTIVE_LOW>; /* BT_RST_N */ }; @@ -73,16 +75,16 @@ status = "okay"; }; -&uart2 { +&uart3 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2>; - fsl,uart-has-rtscts; + pinctrl-0 = <&pinctrl_uart3>; status = "okay"; }; -&uart3 { +&uart5 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart3>; + pinctrl-0 = <&pinctrl_uart5>; + fsl,uart-has-rtscts; status = "okay"; }; @@ -130,14 +132,6 @@ >; }; - pinctrl_uart2: uart2grp { - fsl,pins = < - MX6SL_PAD_EPDC_D12__UART2_RX_DATA 0x41b0b1 - MX6SL_PAD_EPDC_D13__UART2_TX_DATA 0x41b0b1 - MX6SL_PAD_EPDC_D14__UART2_RTS_B 0x4130B1 - MX6SL_PAD_EPDC_D15__UART2_CTS_B 0x4130B1 - >; - }; pinctrl_uart3: uart3grp { fsl,pins = < @@ -146,6 +140,15 @@ >; }; + pinctrl_uart5: uart5grp { + fsl,pins = < + MX6SL_PAD_ECSPI1_SCLK__UART5_RX_DATA 0x41b0b1 + MX6SL_PAD_ECSPI1_MOSI__UART5_TX_DATA 0x41b0b1 + MX6SL_PAD_ECSPI1_MISO__UART5_RTS_B 0x4130b1 + MX6SL_PAD_ECSPI1_SS0__UART5_CTS_B 0x4130b1 + >; + }; + pinctrl_usdhc2: usdhc2grp { fsl,pins = < MX6SL_PAD_SD2_CMD__SD2_CMD 0x417059