From patchwork Mon Sep 12 22:22:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 669055 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sY2Yt4prJz9sC4 for ; Tue, 13 Sep 2016 08:30:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bjZi5-0008MM-T4; Mon, 12 Sep 2016 22:28:17 +0000 Received: from mail-bn3nam01on0044.outbound.protection.outlook.com ([104.47.33.44] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bjZi1-0008Gj-LC for linux-arm-kernel@lists.infradead.org; Mon, 12 Sep 2016 22:28:15 +0000 Received: from BN6PR03CA0054.namprd03.prod.outlook.com (10.173.137.16) by DM2PR0301MB0718.namprd03.prod.outlook.com (10.160.97.139) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9; Mon, 12 Sep 2016 22:27:51 +0000 Received: from BY2FFO11FD039.protection.gbl (2a01:111:f400:7c0c::155) by BN6PR03CA0054.outlook.office365.com (2603:10b6:404:4c::16) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.619.10 via Frontend Transport; Mon, 12 Sep 2016 22:27:50 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; pengutronix.de; dkim=none (message not signed) header.d=none; pengutronix.de; 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 BY2FFO11FD039.mail.protection.outlook.com (10.1.14.224) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.619.6 via Frontend Transport; Mon, 12 Sep 2016 22:27:49 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u8CMRmSi022897; Mon, 12 Sep 2016 15:27:49 -0700 From: Li Yang To: Wolfram Sang , , , , Subject: [PATCH v7] i2c: imx: make bus recovery through pinctrl optional Date: Mon, 12 Sep 2016 17:22:30 -0500 Message-ID: <1473718950-6667-1-git-send-email-leoyang.li@nxp.com> X-Mailer: git-send-email 1.9.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131181928700874222; (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)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(104016004)(2906002)(4326007)(50466002)(86362001)(87936001)(36756003)(2201001)(19580395003)(19580405001)(85426001)(2870700001)(92566002)(50986999)(23676002)(189998001)(47776003)(8676002)(8666005)(7846002)(356003)(81156014)(8936002)(50226002)(5820100001)(586003)(81166006)(33646002)(5660300001)(97736004)(77096005)(229853001)(68736007)(626004)(305945005)(105606002)(106466001)(5001770100001)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0718; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD039; 1:BkLvSJbDd8x1y6jscl0GvIkQzYbfNuMFQMXtNYa8qfs0K9FvCZ8kjm94KiZjc3SP++ETID6cd/Xdi5AoqEGiW7R2KGTVOXCsDTijLowEqj1sKBnO37x1IeqLvg74yfB3X78H9H8LaVm5cohNQ/7iNy91VpIqbtpwGkyNnXS+0PGiao3MYxhqEbFT2FSQUrTxk7mYSL3+ietHNEoBQ2XFb5Sy1UGossnEUo5TaEVF8Lsv8Q2LmpxzYyiMqGo/zuaijLB6EuLy9PrlKgm0V77t89QlJ1VsTuynXlgaQ6hYq93ybvQL69TGWgh3leD6bmguZJJHpMvl88QP1c3bQuUVEk3dmFLBAgkK6b2zCAh6wAd3b1IYVCXkq1Dq1cxZkUwDTJdXGNzrho4ajRjzqtM3l7Yi+FOul/0Bv6k0KV/7NHXgw1zM6da1BPw439grF5sVoiz1vRTNRD4YiIqYiQwYlu4hbaNJI1c0r+mHE4Z7+xUHoUf+/i4+ZjtO+IYR5A/gdlw/zgQVL22vVhhc1m3IHU41H6A+OF4oVNlkAnPbs2JtoelYWfe1lDQLkyTLlaFTko3PkVhCIzwTJT3bMfWEdrIvLauZiK2nL956uxpYmQHlKpFZB7ViPSD0+O6MSnUm X-MS-Office365-Filtering-Correlation-Id: 9de0c1bb-f9be-4440-8dee-08d3db5c07a1 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0718; 2:+uJNpIdIsh/c0olmdpeW/klS8bn9o2GLkPq2UgrmFk6q7lEQ0k9mzDVbxWF+r7FrdTJtz0jqoATVojTDiv8VGwWF6JPyJghRPviOj/PSJn2Jdx/fER2I/Xk/PoIyTOHRzZwtB+jkQBokod2c9RDHpqpfA/OHYZpXRF5OzSGpz5EPbnJpj3R65VeVdHoDt+OR; 3:mwXbbIWSb5ChpDypRxJ0v5U3zk8g//QfhI2FphgH3yAv5Wsy4Qv3RgTETyXbAYVJpyETJLCHQrJ4ulVSLFEGeK+Ee2O3CJLmk/D2TtO9Bdsfpoxyx9uzHz8MWYGXlHbzZtCJWTKF2XOC9wYdtT1jRnurokwYLgbE/5uvwGqPBMRyZfNAS+ZJrvvkGg5Dtf4TjqGUwoHsg9q/4YSPWqFIzwvOKqMJs7knM9TV2FpuXxg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0718; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0718; 25:AKS3dY9s/bltM8D+BhvjisR1hKj7A2ubuYcyQgREVLebwBnkGb9Bmx4824pUPdPNkiq98iYhbYYXG7BLZSDS0jAMuyTkoNSJftRp/I8jsvWNS3z76AVTMqhysIMQrZCb89QY8tXfmW/z70rWf6g5s3mpDIlXR/BfFmlXwBR5W/bZFyxUQBUSfRzIG3t0OWhgfMOrUyS1mdfGfO7ZqJVWPNzy+JmWFH50zYcJjC7rQkyct5xs7AIWaVJqlP3GzhmwrLCG6ohW56rxjUMDYDF9SX9jwced0NhOY/UplmUBdPxvSojcVwAXiyjmt83AKVK66TMmHc/SwOClE51mQ4OvEv+mIbSlDlxPc9ayRnUSLu6dwt/mXEtc1ZFOkcoVymRXyNGCT/RnWm7Q8+kBAKiJvMnd/PW99PVeAZmcO/Q+SKNY0a8xyRpzCbmvrm+YOeCW40ZTG+YMRLo9H4Hn32jtdxQL9MaJ2OugkJEET5qI1QdAbXuUNdUiM0dlcx5i2XGbBDHvsfJbgVd9KLNCBm/zg7usyaJql7ByFVabGG+y44kyWFGWkzpLlRci72KNTEWAK8XeG1H6/Wn5XO+FEMdb6nTw4ZyTp8aakbYJd8cLhxIYcMe+we5EeZC7nVbV2rl5RvzER6BVCycjl/oUkl2MQV+0ChlXf5PcyPsFvKqFUQuk7K3i2VNfUaA+ElHi0a0Gr++RCNyHfYAPrpWa+UKaiCmfwsnBuMwmAED8p6xvSVD4wZ2hTXEVVICyZATv2dea9BT73nF1+e4FeUCffxeyfQ== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0718; 31:jUZeDJmd0fRUkkFnNK7wisw72iJkQr27/Qf35GHC2KTwgMpgrtSJeJKVlT/YU+NtGVp5v28hws0hBg7gPn5IexcsY6JgKWDYFYwpIXOjViYwAY4hwaNALKLC1BdREZFdUD3UFxD4kXCQSRfyGd+vrJxqgffyLh4ZFRimxhh5V2bAWaCGuphaJmC6dHvgtgzeI+diR4WveqJowh6M+r9obiOIQPIKpksnWkLqGDV1cDs=; 4:1JOlRDlwQo5UPwTj6MpUJwJijf94QGTS4904xLYuNBvJgoMisFLQuq0DrwzfQsr9bIjGE8H8CRcdd6vKcR50KuadZ+3rhtKmdMWTKAcQ44jM8uYlfqKg4Qgx6xvxgJPnvaeGZPbBfpQ1rWLDL4uxeFGjDLt9HagsG5tZEzxLtQpwsUwxEM4yWiLb8ipDOEa/WrUDCrUBaf8l7OjcPLYCAyjnXgpCAKzhHfdUl7it10lna2MPVJn2genMFQZTy7FlB+aRXa9m4XT1TSeSOHyJabZBAYirxekZMdGTJH0BQtgoE5XzcKoJXnw+ru3U4SxoKwunUFKX8wavj8D/jz/jw3I4OcnJGOlW3Jj0QelqpJDR/HsldaWqaZO0NnJQtTLbv8A9Bhc1dZHAHwb/GTXGhDfKKYyf4Cxxzcq0KttQgjdejPJk5+VI0rWY3rKRG51SIm7qaVC4MirQHMqEFZblRc2j0UJWoOtfiLxS6FZDUKTMz8ikBQmUU5FCzANxkq6JZ9iIx29WOmxdgJt8mz2GNoFyauFtScYYLjiKw/l5vm0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:DM2PR0301MB0718; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0718; X-Forefront-PRVS: 006339698F X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAzMDFNQjA3MTg7MjM6d1pnQThkRmJOa1Z6R0w3Y2VZdDhVVkho?= =?utf-8?B?MEI3YVZtT2FVQmtSelN4REdqRUlaWE8wQWcxdnE0b0psamowVitTVThuT2hQ?= =?utf-8?B?NDBVSGV2VEtSQVJBTXk2TjVNRWxzN1Z0STZ3OEVXWEFTVVRwaEFjNGF5Slkv?= =?utf-8?B?NmtXTW5pNFZrZGN6S0oxenVFN0Y2RTRURmxOV0N2SEp5ajlpcFlNekZMSzJ5?= =?utf-8?B?MUNhSmoxQTZWNjFEYnFONWNDNHNrSU5JL2VXZGZSNjhxQ1R0RElVTHFTZ0I3?= =?utf-8?B?eW9lYko2WWpjOE14ZHdBcFl5L1c0cjdUYnUxYi82K1pyM1RyalJpcFFDcWI0?= =?utf-8?B?Q1RjYWl3b2txMkg3NXVIelpnM0huUEpjR1pnSWJ5cmNmL3RvK21yQkJEQndq?= =?utf-8?B?cnJQd3pwY09WZDV3QnZxUHVVMzNDUUVSMDUxYTVkVFNmMXhseDl3cGtqY25j?= =?utf-8?B?dWdyQWZKS3ZTZzd5Sk90OURIU0RCRUpxU01vaUxXZjQ0THM4Nnh2R3B5WDBp?= =?utf-8?B?dVBsVlEyRklCTlZYMTFRNjhVZk5qN0NwOXJmQWh3NUNrVTN0M1BYU3AvNkFm?= =?utf-8?B?aEdURFVNVmZIRTJ1SnBmR1BqMlNOd2FTR2lTR0QwNnQrdUpEVm9hQmdNbm85?= =?utf-8?B?bzRwcytwazVXSHk0bUJySVZFbmdIbmdZOTdLV0ZqRHRBbmdVbTMyc0k3TmZp?= =?utf-8?B?SFRCUVdtZHhDVjBvSHZSRDViOEJ3eFlLc3hrWmpaUS9oblhBMGRtcjU0RmJX?= =?utf-8?B?S3RHOWo5bnRyTFhxcVBnOGlmQVJ2SjI1d01vaDRWaTl4Q1VMTmE5Y0lmMGF4?= =?utf-8?B?UWRETUZqLzFRRDBOdXZ3YTY5S2d0aDFsY3laRjRPQzhJU0x2S2l5ejF0VDhB?= =?utf-8?B?VEtnSWYxS1VYa0dXUFVjSml6WVBhS1drWkVVYzF3V2hHZXg0a3F5TFJUSXJp?= =?utf-8?B?RWcvTFFWMS95alNuT0dPc2VvK3RmK0YyTU1xMEN1N3ZWc3pPeVhaWjZLVmNz?= =?utf-8?B?dDBnZ3N2MllkQjJjVEwvdUlNWUlCNGVxK1doRkl6cXZFSmZHNmR1TCtGMjJI?= =?utf-8?B?UHFORy9VQlhNcmh0SlRCMlJpNWtUZEViaFRGSnVZMHJCUUFObW5IQ3F6MGpJ?= =?utf-8?B?M1BaU3BIWjNsdjVIUjk4cmNmektUZ1E0cTNocEdFeFRNVUhPU3JSdlltUHFt?= =?utf-8?B?ak1hYWxLTXZwQUdlWEZSdlViUHZ0QmdLMVUwMEpFQ3hYb1ZlS0xVUXV0TVhz?= =?utf-8?B?NE0ybkhmQzlpZzdOSkQyOGhybEd1WFZneklxRUxzd3UydTJjdFhQY2xiaXRI?= =?utf-8?B?U21CL3NSSHBGLzhHRVVLcWpnWS9DNGxvenV1WmNndjkvTERibisyY3dVYkx1?= =?utf-8?B?YkFUTXA0T05RbXBOQXZvZzQxVnlKQnNzbzFuZWRQYkIzMlUrUExDcjVzZExz?= =?utf-8?B?RHpXMWVlVHdJVERZUmY3TlRqeDhGNkpmNFlzV1RGTytWQW1kSFJNUFJ6LzFp?= =?utf-8?B?Y2pLTFQwWloySjZGSlJiamdKWUdnV3ZGblBXMEl1WlFlc09XTUwzVVllbWlr?= =?utf-8?Q?Daz?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0718; 6:HE5C9SOd4OByWY04cjnU6Y7NUIZsAopQY+N/R3eUwxd3IpkxVeSNMAWq8unHFtNwQ8qe7ojLHWIqnolqvj3C4Y4k7Z87n3a8AiJjwLZDVdxs0FJ/DEiOVXU7+uS07Z1wusr54Bqw+zC74N80hPnNSnLfAQ3AgYrlPTw/xDulleE90vkxwr+SnxzPss1qPJlk4ygd8tYNwvDdyAbSmEuULPGF9kjpoj4L5D6TSjkUiMwlqd6rNJSrzo3xHyJ0G9NRSN1sAnO89cD+478e5NBiKFNyA11dzVx6Oo0hyYIdP90=; 5:c/DyVicTPn7YD8zkFLy2BLsnSJblOB4HFXOqUb4mXe0hzxJVHFfnBBLeIdSM9KXrXMuZT5t4QEkwTpHO3gyNazb1/SRncsxxKw/RRERqfFc7pOCtDE134uD56lSGj9PRBvcRi09LA+nXHhkZ0RWaquaarLJeIPmg7VQTs2Dk+6Q=; 24:WV4+X7oItE8fI5U1rSh9g3kf/7fpMybUksjZQNarMOGSUXYcx8tRE6fYVzVBfqXF71p940bJ2Ekf5y3UZLcbhefwf9YGIsq2vrBIuhipIMs=; 7:k6ocZqCAvWuSV6AOh6GF1Qq2+aUr8GERJDfs95VzclrSW2wgtdACdti1mrF4pqGNqf/+Z+qn/T/H/luDLd/ePNiGm3Ptxm2uddsQofwC/1A1OcPfIqMF2TBCxfM0aBHjTKvld55jpTBqjszghNHigJDWtwmfszoLHxSQ63J5nbzdbUW/3FBRCQrX/GOR5YRpi40gBDpvHpGpd5b/K9x/1yXoXJRHAjDPj3sqpTI94Dy1WnzvwTxshmqYITa12uMz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2016 22:27:49.8846 (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: DM2PR0301MB0718 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160912_152813_912286_B7819AF1 X-CRM114-Status: GOOD ( 20.91 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.33.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [104.47.33.44 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Gao Pan , Li Yang Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Since commit 1c4b6c3bcf30 ("i2c: imx: implement bus recovery") the driver starts to use gpio/pinctrl to support optional bus recovery feature. But pinctrl is not always usable. There are platforms such as ls1021a and ls1043a that don't support pinctrl, and it could just be broken due to old/broken device tree. The patch makes it really optional that the probe function won't bailout on pinctrl problems instead it just disables bus recovery and prints out notification when there is problem with pinctrl. Since pinctrl is only used by bus recovery in this driver, move pinctrl initialization into bus recovery init function to prevent confusion. Signed-off-by: Li Yang Cc: Gao Pan Cc: Uwe Kleine-König Acked-by: Linus Walleij Acked-by: Uwe Kleine-König --- v7: Move pinctrl init into the i2c_imx_init_recovery_info() Update commit message and code comment v6: Update code comment v5: Revert the last minute change of recovery info initialization timing, it will cause problem if initialized after i2c_add_numbered_adapter() v4: Remove the use of IS_ERR_OR_NULL Move the condition judgement to i2c_imx_init_recovery_info() Change the timing of recovery initialization to be after bus registration v3: Rebased to Wolfram's for-next branch Added acked-by from Linus Walleij Update to use new nxp email addresses due to company merge drivers/i2c/busses/i2c-imx.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 1844bc9..54ce9c1 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -984,11 +984,24 @@ static void i2c_imx_unprepare_recovery(struct i2c_adapter *adap) pinctrl_select_state(i2c_imx->pinctrl, i2c_imx->pinctrl_pins_default); } -static void i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, +/* + * We switch SCL and SDA to their GPIO function and do some bitbanging + * for bus recovery. These alternative pinmux settings can be + * described in the device tree by a separate pinctrl state "gpio". If + * this is missing this is not a big problem, the only implication is + * that we can't do bus recovery. + */ +static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, struct platform_device *pdev) { struct i2c_bus_recovery_info *rinfo = &i2c_imx->rinfo; + i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev); + if (!i2c_imx->pinctrl || IS_ERR(i2c_imx->pinctrl)) { + dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n"); + return PTR_ERR(i2c_imx->pinctrl); + } + i2c_imx->pinctrl_pins_default = pinctrl_lookup_state(i2c_imx->pinctrl, PINCTRL_STATE_DEFAULT); i2c_imx->pinctrl_pins_gpio = pinctrl_lookup_state(i2c_imx->pinctrl, @@ -1001,7 +1014,7 @@ static void i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, IS_ERR(i2c_imx->pinctrl_pins_default) || IS_ERR(i2c_imx->pinctrl_pins_gpio)) { dev_dbg(&pdev->dev, "recovery information incomplete\n"); - return; + return 0; } dev_dbg(&pdev->dev, "using scl-gpio %d and sda-gpio %d for recovery\n", @@ -1011,6 +1024,8 @@ static void i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, rinfo->unprepare_recovery = i2c_imx_unprepare_recovery; rinfo->recover_bus = i2c_generic_gpio_recovery; i2c_imx->adapter.bus_recovery_info = rinfo; + + return 0; } static u32 i2c_imx_func(struct i2c_adapter *adapter) @@ -1081,12 +1096,6 @@ static int i2c_imx_probe(struct platform_device *pdev) return ret; } - i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev); - if (IS_ERR(i2c_imx->pinctrl)) { - ret = PTR_ERR(i2c_imx->pinctrl); - goto clk_disable; - } - /* Request IRQ */ ret = devm_request_irq(&pdev->dev, irq, i2c_imx_isr, 0, pdev->name, i2c_imx); @@ -1125,7 +1134,11 @@ static int i2c_imx_probe(struct platform_device *pdev) i2c_imx, IMX_I2C_I2CR); imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR); - i2c_imx_init_recovery_info(i2c_imx, pdev); + /* Init optional bus recovery function */ + ret = i2c_imx_init_recovery_info(i2c_imx, pdev); + /* Give it another chance if pinctrl used is not ready yet */ + if (ret == -EPROBE_DEFER) + goto rpm_disable; /* Add I2C adapter */ ret = i2c_add_numbered_adapter(&i2c_imx->adapter);