From patchwork Mon May 15 06:48:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 9726165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 15488601E7 for ; Mon, 15 May 2017 06:49:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0393E28966 for ; Mon, 15 May 2017 06:49:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB08028969; Mon, 15 May 2017 06:49:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9110428966 for ; Mon, 15 May 2017 06:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=C9JpTo5qLYAMLqhsUcQUt6N9XNM5gqcQkTYfOVK6sow=; b=kQOo9y/Ly93EvR IdJ5Q+X83R5qXTxHGm3WUcfb0EzHnoBJtTXU1yRbPCcp60sCJXnqFbrFBtwXoMlK9mfndYBG3uyg9 iOIbSwsP+T6dEc5fBm5RGaEzFxSBJ9yePLOGa1SJK2WhwSbckOTTccoL2A3Gzmm+8G/7Ju0ixpKOs HzG+wmYGbPj9up5pYtuH+WtNBmMgADiGv7QX4dsjgQKJJtH4NcJBzviYSBrbuxd2sXMoNrGRREETh 0o8SVOJJ/FZv6faSlHXNp07uVLCvtAn9yn2Bj86XPfKAtB+4kUI5hPXt8f8L1B9ehRQsVCVKCmz2P KlMBKm4JIvj9iuScSegw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dA9on-0008GB-BG; Mon, 15 May 2017 06:49:21 +0000 Received: from mail-sn1nam01on0063.outbound.protection.outlook.com ([104.47.32.63] helo=NAM01-SN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dA9oN-0007eF-E1 for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2017 06:49:00 +0000 Received: from BN3PR03CA0108.namprd03.prod.outlook.com (10.174.66.26) by BY2PR03MB173.namprd03.prod.outlook.com (10.242.36.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Mon, 15 May 2017 06:48:32 +0000 Received: from BL2FFO11OLC002.protection.gbl (2a01:111:f400:7c09::180) by BN3PR03CA0108.outlook.office365.com (2603:10b6:400:4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16 via Frontend Transport; Mon, 15 May 2017 06:48:31 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.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 BL2FFO11OLC002.mail.protection.outlook.com (10.173.161.186) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Mon, 15 May 2017 06:48:31 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.182]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v4F6mJ8Q004248; Sun, 14 May 2017 23:48:27 -0700 From: Dong Aisheng To: Subject: [PATCH 2/2] pinctrl: pinctrl-imx: do not assume mux 0 is gpio Date: Mon, 15 May 2017 14:48:26 +0800 Message-ID: <1494830906-6442-3-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494830906-6442-1-git-send-email-aisheng.dong@nxp.com> References: <1494830906-6442-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131393045119031288; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39840400002)(39450400003)(39410400002)(39860400002)(39380400002)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(50226002)(33646002)(110136004)(38730400002)(8936002)(105606002)(305945005)(8656002)(5003940100001)(4326008)(8676002)(356003)(39060400002)(85426001)(5660300001)(77096006)(2906002)(81166006)(2950100002)(47776003)(6916009)(106466001)(76176999)(498600001)(50986999)(97736004)(48376002)(189998001)(2351001)(54906002)(7416002)(53936002)(104016004)(50466002)(36756003)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB173; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC002; 1:UWtr8NZA7h90YeN9CSiu0VrBFdFY6wmsFo55nHd0hJPwvppBs9DW0No85MivBNg1jxUE6AvoQaMaPnA/WwJz4W1GDyB7eDgcM7CupTkr6iiSmhrujNuqGiUl/VbY+qRFvkXh4DQBMBqh4J7prM7cAmXevFsr9XrEp5q3CgcI4VY/d/NMU7O65Re9Lbo2+x9YOkVObtq49HoSHEPMh4niqfi8vOeyo7jsc7/+/poQtwAPCfCuCJE3UbaGR2Wym0vgq0wKklcU4hf9Zw+h55SC/fp2vv4djY8mZ+6714M+bwMVxd3RmFGPI1dIlfox6rOgg/srk+xeK3n5o91lWCeybtlTTUyewyKeZb6+pdoDlG5NbHuhNrOMy5UXP0Mg+WLynlQIeJr98lasQeOSfNOzlvVLmW+ueB8jZpVt/Lc57o/oycRdViupVLLece260Whw2SaHX0a8kaKpjLxmDJWvoCohs5yMKZj5lmAGwyrc6avXmgv0GO6uoUA9gSclwu85ofDn2QdZMtisQpKhQMthF3F+mSgiMDftIGIMNqgNhyMvSBN49B85Qweu6GhJNddDSUnI+viaxZA0lvbtX8KShr1MDHVuoHHGzIEOLo9Ff+QfBmGnRt8UC6T15WXb4Apb MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27409ebe-49a7-49ef-d7f8-08d49b5e66bd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BY2PR03MB173; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB173; 3:L4jS/q7Wrsqi5LqUzjIOBdAd0p2oWyPI6lqA2WOPJgUyQyEAzMrxQolwa3urC+Bd5EiFryJFzgSehrEtF8IM0FYloPXO2YObhaheh4d86iOTWBPyPa5n7nZ0pY/iHEOcz9x/dBmCN1CO8zZqhAMItFHzUNMBFgd7MlY9vAY+ui8i0lchIfrFwOM5Dw8LNOYbfAuXE4aw5BdheltmLHsgdlnJF56isNfvjN0r67Gk/X9lVeaqjZfTRNcfEjHAdR8L22/vWYjMf1Hy7KmF6n3NKIALbd0vGZEFDXzAeP0mbCUYjODarnrF6g6hxtNGTIKBRj6/YCB94Yb01/Df4j9ZQ7WpggIvinpP6DMFNAQkyeF2bPMpWQ5S2t4Q1kWeSUC7V2wtNR6lI6YL6EODw+cPA5wvh4hDFLCoUpuhrjxBtbXU+Np1WyIKVowm4YRskkyn; 25:Wmu9kw93cdvBluo9dcxSL3UTrTRpAGSjtILG5gtagbHIVeOpOgOQ1amRrMaY2I2luZpKRVMNkY0uvPHF+oypOWCVL8eztNGf6uaot5GEJ2KD92AC5nqii4Tvu5Az0f65rb1NHyQT4e5tA5wMIQNlUtwaYlq80zEyFy+e6HqITCMrNmCcNOiRBHc67h3jKmYi+oWgdjwpc8Wmn/bBS+iyn0MuADk5+b8a3RFrmsh24CrzRuppdFAt4oGhyx0hfB9gUlCz+Hlu4hU6P5YTswPMnnuGERcdFZRDEmsvAiBaNVlKtg+Hsckj1CVTOZPKmE/kx3dcXkSuQY4kyx+14kCCnj4lgx4h56OJLXuzOMD1AeJjhGclJibA5AOy1PKiAVnFxiGy4axVSHh7HNk560MW6LaWMjrXpMNOYrNAb7btFFu0CfJKcLNm4cXQz6yPLkcBXLMEQZi6t9a1tGVhRod6GQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB173; 31:YMMnG7Yt8iYAB8+I0gxhazWA9kxn1tawtsmcQxAAUZ2Yzeqs8J1OsdA1s4CgghTaE28KySoSiJ7ONF2XR9WdidBaAtMTaaQEQQmd1ECocXr8Qy3/o39/CPTcrM30v3Uum63yzLlLN/HjZ02/teXsk0TcLKZU+rwDPtrc2cWoRfO8tVKE6jcIsVFdSY6Up7/UOxBE0PJFFFpIQ+iYam+jxvPQJgAqXtzojs+3ssye2cwvNXxPx4Sk5cMHe8Ls8EzasSSu7J7P5EpBiaSAcZEhiA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(13018025)(13024025)(5005006)(8121501046)(13015025)(13017025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123561025)(20161123565025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123556025)(20161123559100)(20161123563025); SRVR:BY2PR03MB173; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB173; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB173; 4:jkYkJ3BWtTkTkCjg4S3p/LU9nadXXgXfFZwLIRiXGTC?= =?us-ascii?Q?ni+Tki+ecnGI8JWdLgAjwc5vo1yjMlBsIXfivtRaEYHDwkz513HN+KaYS0Av?= =?us-ascii?Q?mhezGhzorFcjORpHVtJ7CWB8eoBjxV+hQYw6RSCr3trq6i+u9Z+me3HTNqCu?= =?us-ascii?Q?0groFT7xSmOZBafVibt+seTSkiiIFYRHhvWeYqXSlPyjV/deJ4jQ669otCjt?= =?us-ascii?Q?uMZNxNKBkeJTSLBZtedFE4NS/r2IgpjBuS7V23DbEgzA8PVJFA7G8m6Tya05?= =?us-ascii?Q?5F1w1Jifni4RMwa3SgDUIw+aBZ9H4rnjvLSUk26qBA0yOeFcv7QztFhnP1pM?= =?us-ascii?Q?TDPdgaAjNPcSYvU57ZXsxafAOMfwLWJ8CCUoR4w2t6hXNL4x6PdakBpQSqGh?= =?us-ascii?Q?aLfOoojjg7EPI+Z3VB6jNDRI1bZfAvCsSxL/EgJ1Zp8XEuMn5CJmoqz8IhPH?= =?us-ascii?Q?a4GQ4sLc4xez2pgqHQMWAWT9VkRmbUqHfX9TkFCpPw8a6ty8iVlmtkn4D5bN?= =?us-ascii?Q?altkIyNFRA2qk+beUr/4VuRyACQDM9Wcdp84a0qfjQ08lOEjqyBYgIO4q7bx?= =?us-ascii?Q?KzR8p1OKet9it+n3lK4dwzDThK1aSuPxaSrUezaCuJ5tHqDhZ/2P5HxaKBPI?= =?us-ascii?Q?maPm/HMpeHjjZs+LOngcyZjbzR1DxWeUZLCI0xGhmp9Ik/dQssFC7fgKM7zO?= =?us-ascii?Q?WWSmlSuz638IYuS33slTMQexv/RFHcTkogY3mSk29wKPG3Ub99SlFh0lJuU7?= =?us-ascii?Q?ucPAkYRDiTMbz3BSDjTOF3Ldoywf+jZDTAkYR2SVn3MjG5mpR55m1c2VIyge?= =?us-ascii?Q?9KjYcTl67HOJYcHhA8reREzr2LmtJ0h1MYm8CFrriCk7DtaU4TV4zfBtIBsh?= =?us-ascii?Q?pirWai1Ss+r7X++4VJ0nGwXyW2vA2VKzr60TSlo0Fqcn92Njxyw28cqWAPoN?= =?us-ascii?Q?j1GfGVPlHvZveK97wXmA0LzqWiSiI2RqL4qv6WA=3D=3D?= X-Forefront-PRVS: 0308EE423E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB173; 23:LBDxREHLszRCRPhSsszeuhEq5xluiITZPtGuSvsedl?= =?us-ascii?Q?u9g/E/qM0zdiUgc3qMYEsiYG2CyxgbUVZdd0DKesx4LBKvDO7rjtMbtugjs+?= =?us-ascii?Q?SU1c99Xle+vaHOstZzxZhd3r6nYxOn/+0oXNxTvET2+a7UyJHUfRG/HW37Kn?= =?us-ascii?Q?javW6sdWBxuRvbQ5Vsxkw9fzqcANVO1PredAzyBnQ6jo4sPrijKNgAIIIRbu?= =?us-ascii?Q?UdnU+anGHMw1pHbbJjNcawfcE4w/tArANDNgNPA54LeSDwy+vWQW0HUhOshw?= =?us-ascii?Q?aJWlFosX9q78N90zDXVnBRplCt77ZCi3Y/ogvFYY8brwrdzo/HJpOVxshDky?= =?us-ascii?Q?9y8cXYB0JdpdWE78qpodcliMNcuI1Pg4G12KGmjuX/O+gxzBtvONIxVQnu50?= =?us-ascii?Q?hoGU9K0nCO5NFw+t0JFZNFVcqbGLmOEjmNnFDmPbEBPq5GsZc5hGCKQcS9fH?= =?us-ascii?Q?+cAu1mU8rLkXjkyJWYWzKgHlpKvdsHqVLEsWt1eLrRSvSIpEs8R4uMLjApFf?= =?us-ascii?Q?rS59NkZzPtzKhZhUHLLpxi9MsFyqP6omCWTU2tWLky3DAQxhEd8wTmNK90A/?= =?us-ascii?Q?+FPb0WaAy1QiTo6EK44h7kYPCkJn87zSvCLqrqrIHqedZYUy1Yox0dXkqyu5?= =?us-ascii?Q?0KH9TnkXi1u8a0E/JVnzc5er8YFRyyAh6BcBloD0wFWLOmt7QKAuzZEx9PNq?= =?us-ascii?Q?Bklx75yuLut2tUHAiFWjhDgrUja/i3RctyBTP1aqHLJ5CmdI15Th+dVJM1yi?= =?us-ascii?Q?oZVDbLyiwDF13hSsf1T18mBr+wbZpfewxuv7GTycNpivSCyWA77Ip5ZEppK7?= =?us-ascii?Q?nER5uJHko2zvmCuzcDiRCDWJiXxwPMumFLocmxM56zdjEr8hAiqAtiqkzElH?= =?us-ascii?Q?NZ22KKbnZETd48eqQAPBOKkQsxcvo8e0WB6Y/CjU+VVzlsNG9UAokaaYoFeY?= =?us-ascii?Q?ZhME5mTCE6ZoGMGndrltwAYzEIYX8WkMCw2zhClzQHri3v/gsHzjJqGb+0u2?= =?us-ascii?Q?Fk7ysYtuQcqJ10Idjp45ghPggD/oo/JnZLiXXdTlaw3Tyh/8pwZ6vMO4Si2s?= =?us-ascii?Q?TWza3lSG0X5ze72HiNEjapMBHnGSzzIHSWRNInkQxhCRaAAke8oafLaIOJXZ?= =?us-ascii?Q?/K1bsuZ9S6ODY62Db4CF9BHBHWcMyVR9AJUNv2O1ppAMYaA20mwCfOhuLJWM?= =?us-ascii?Q?3zVbCKlfT0ZnTFJxqR6sTSkpFjlEz5VGRGaR8p0XzwnK/zrOe1nWvNdiIq5a?= =?us-ascii?Q?uDwaI8bBQvrq0SZm+thriiP6qOHkF4TSKiXrU5nLmUIb5TDSXH+pu5Mhd1zA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB173; 6:ELYgo3sVHhmJ+bObJJn9KoWj3fXJvSGD0Wp/w2uAh0u0tglzLMhKzJ6sR0eX6V4YfBPw+dqjuHtUCqRUL4imuE6s6AUYOS28KvubhnyDXrPy0kt25SQbKWm3OTx3BmFJO/Gg1OQCHBSO3/gXEe/ZcTfHYD4p1r8eRpa024eRt8UFedEjOZLF2KUTiKCTr8q6Czw3LneMgsF+jQ7XNQyOo55LqxMCPx31LFsL3DW+2fplgzQEB9Gsz/7W52Xfyj9AzhrrcFtmbADpnvOTUgCtXBwYlyiHl+Ewzjw9NytJhpO+fx0Rhdbq/ptJKsV0bjQyk56FwzlkFSimEqevQAgJrKp7cvPgDm0PQN5IpnGsJw5sXNb20xiCYFMH0A23UkFNuFusC97Ndp6YvEbTjH7/iVQ1KQXWMHPL/i53f9pr9ew7+vSJ7O/DFSwDQkMIqRty4/NSW1Jhfduh7oH9armD0AjmeSo7f+DXBtm20iwQ35T171Btrbl/vEYSMba1oWkcC0P3aRcfdH3hQzU+4YFcjQ==; 5:0xar1rzzYUKRytLzWjf3Caa7bLZxwu+5u33MjBa8ThKLoKG4xnDQ4F3r5MjAj++XZblXNR9SfhrLr7V78oXfLzKwRWsy8nROCFJURcIQnirINRuM4JPpZvbwCDn0MmMnOik5SldIhMcCAnkxmoNXJLzjROC96anTofdUnnnXl085sHcYxVype9lSuOkIXqE9; 24:8D3XwVIBOGFbOuijMgRGOe/5yM+TC6mhoFka8ZjImbENcRNcGbnRKs8W2SKcql2R+2GdEJ4DZk77qNKdfYrvdUXNKWD44caEy2Lzd846M98= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB173; 7:KvJh/o2I6FYQ/je/FRQ5Jimm3pdISCS/tosojxs7t9qY4vFbsvZD8AmY7GGRq39y1kQ5eRuyJQR4k5fXpM3zQqaa/AEdAD0kg2Jjuqtof4r9n0Osrs4y8Kwxds8UvY87f8TyGYtMFJvCUwnhIYb30/Mcgimsr9O7IkkZaH/rdRHbYUp159tXvkN5tvQLYMUlDwRiXGBPBRZThV3TtZNxvTvbWP48mrAGCo0idXXsVsbPv5j9YWdTRJakr9xRw8Q/YporCiujm8DcYOuL4jRAQ+aUTEZO7jfPu1MtKAheXz+JkI6VJJUWrw0Bpe7Biy1Z8l5I6n6x9nCWQuqvsdNpdw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2017 06:48:31.7315 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB173 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170514_234855_978928_B6EACE73 X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dong Aisheng , Alexandre Courbot , fugang.duan@nxp.com, ping.bai@nxp.com, linus.walleij@linaro.org, stefan@agner.ch, kernel@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Do not assume MUX 0 is GPIO function in core driver as a different SoC may have different value. e.g. MX7ULP Mux 1 is GPIO. Cc: Linus Walleij Cc: Alexandre Courbot Cc: Shawn Guo Cc: Stefan Agner Cc: Fugang Duan Cc: Bai Ping Signed-off-by: Dong Aisheng --- drivers/pinctrl/freescale/pinctrl-imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 0d6aaca..ed8ea32 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -281,7 +281,7 @@ static int imx_pmx_gpio_request_enable(struct pinctrl_dev *pctldev, continue; for (pin = 0; pin < grp->num_pins; pin++) { imx_pin = &((struct imx_pin *)(grp->data))[pin]; - if (imx_pin->pin == offset && !imx_pin->mux_mode) + if (imx_pin->pin == offset) goto mux_pin; } } @@ -292,6 +292,7 @@ static int imx_pmx_gpio_request_enable(struct pinctrl_dev *pctldev, reg = readl(ipctl->base + pin_reg->mux_reg); reg &= ~info->mux_mask; reg |= imx_pin->config; + reg |= imx_pin->mux_mode << info->mux_shift; writel(reg, ipctl->base + pin_reg->mux_reg); return 0;