From patchwork Wed Sep 7 17:03:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 9319693 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 9E4D7607D3 for ; Wed, 7 Sep 2016 17:10:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99805292EC for ; Wed, 7 Sep 2016 17:10:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E1DD293A2; Wed, 7 Sep 2016 17:10:25 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 92357292EC for ; Wed, 7 Sep 2016 17:10:24 +0000 (UTC) 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 1bhgL0-00080G-IL; Wed, 07 Sep 2016 17:08:38 +0000 Received: from mail-bl2nam02on0061.outbound.protection.outlook.com ([104.47.38.61] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhgKY-0007xz-8B for linux-arm-kernel@lists.infradead.org; Wed, 07 Sep 2016 17:08:12 +0000 Received: from DM5PR03CA0001.namprd03.prod.outlook.com (10.175.104.11) by BLUPR0301MB2003.namprd03.prod.outlook.com (10.164.22.17) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Wed, 7 Sep 2016 17:07:48 +0000 Received: from BL2FFO11FD035.protection.gbl (2a01:111:f400:7c09::180) by DM5PR03CA0001.outlook.office365.com (2603:10b6:3:118::11) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Wed, 7 Sep 2016 17:07:47 +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 BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Wed, 7 Sep 2016 17:07:46 +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 u87H7kA1011304; Wed, 7 Sep 2016 10:07:46 -0700 From: Li Yang To: Wolfram Sang , , , , Subject: [PATCH v6] i2c: imx: make bus recovery through pinctrl optional Date: Wed, 7 Sep 2016 12:03:16 -0500 Message-ID: <1473267796-10403-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: 131177416668333777; (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)(50226002)(106466001)(2870700001)(2906002)(50986999)(8936002)(189998001)(229853001)(85426001)(2201001)(86362001)(33646002)(50466002)(81166006)(5820100001)(356003)(8666005)(7846002)(92566002)(5660300001)(47776003)(305945005)(626004)(105606002)(5001770100001)(4326007)(97736004)(77096005)(81156014)(8676002)(104016004)(19580395003)(23676002)(19580405001)(36756003)(68736007)(87936001)(586003)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB2003; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:X5m3Eo7+hAIngoA5w89Z4oyR4sSHgpOSascXO3AIn+iNC66dXKPxbh3XuxvGIFc9umf8AooWSsnVF9H2mrGKDTf51ZW6RwxFDMSMQcunXlxHdDLl7Ojhetne2KgvaGjsegu16GjjmuIjbsWl52b4OX87QeGFUzO6OiwEZCCbMnj/0V+VK8HOuWf00+CXRBz6dGpPcySXcIBazweQWZxCz09DaxdfJuxWNbJ9ao05WhnKfxl+jgRV2MLFHBkj0EuhBMftDHJLxi4ANTfVg2udFzYU9DYVBoRjr5VdcNsztiP36dU1oAIknBqPkkyxuTYkI/dTKrIGfeTYuTbwKZh2h9m0fdrz0/HQ4GuYYiBY+xZVlsq2E8UZHDRH2704aqjv57/fTZq04d9EDGeTCPJ+RD5HHfisYOIO8VkgE4S3a3t8SoDoN7IOaWT9aLlm02ilmJDfS1fSqx55zrkXN/SpRTOjeNm6MurLmBzTfXQ9Z7MwaRTA/pdRe5EJ1O3CJjk/vrlXWpgfFlElIo5i3QVSsn/rRund/duFsFZzfHtsh2wUtW8nKiPxyK/AWGDXl/nuVcGJbMG7mZnBpe4zAJvtHQgJ7HLNsFxrAGRmCdxp79LCbQ4UWSxO63uoZa12Ad6B X-MS-Office365-Filtering-Correlation-Id: e5254e8a-509d-4306-6570-08d3d7417d86 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2003; 2:5QI5qDqu9A1Dv4nC74KQ384T+gGkU/ruvIV5VOm4nBsAmm56q5XdrbBKlh2Ybmox/g7AZx+dpG79xAMzlNE5hxfEJgh2D2c4F71z3dD7xp0Wod7hOn0MXhE1fFSO6pRs0fxCgozswlUAHE0AafOBr3vO7rZj1Ufj1eBfIH+WDtEc725t8gEVSiOzbF4WL0zQ; 3:16A/FPDaH871Q9viMirvbeHEI3Kfuz+hvoEAiG03voe0VA4GiciqfnkOcw3p8CNSBoc1KUZDFde5wIstiWBH/LEvkvEfyu0K2+xp+6U61/wA3GGX/WWbO8nGRUCMi38HDb6pPKPH0tvLqvf2O/7JN3zyKhARKPS7CD3ZreIzLyzqBYAI1dNhROXItjF4x/SXBZjIJt/FNzkEKdZOcp7lQbBGqGJdKwgX5flpif/A3Vk=; 25:7hdoYeotD2vTuU1K7UaYkTjLgSzzOk4zzhnpv+NQO9gjj+R+ZNemSXUGED62/lY76jivwKsuStEVA85Cb9uf5uWUmG+dqQ+zZHDR0XPn9X43yfHzvdW2TXuV41Aojh3bG5Q4w8eeYWsWyzQsrHFh3VpJYyLMDxg2lQx77P6+xmfIQ5UhKJzFiIZ/vREmOK2+0Aq0GNefp0zYMXzps+qeBAqCrBVqUIMRJkmAN5MRcXhsKiDGS+GkHpl35sLY2BsSe2S0C3fsG9LnvptHcK5ZbvJrGI1ZT+HafT4v4//vYRwT28ZtOjZMhxl5XZ/sUE8qLCZyVN0vRVaQVz3s25E6f3ycqV5Oovsu3Um7yaG5kG2jv+FtYx8qs2It821xHxTGVjbiVhebWyg3QTrPbKrJA/dJKDQO/J/zRtG1ii5xMvg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2003; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2003; 31:RfCFvm3X+CuDR4goLzPCIPOd5o0XvRKzh/+gaDZZsN7kWgnvniuymUgbykssz698pDH9Qk9nu9E27wL9mVhv0L9v3kdMVCZqth2Ac8E9+uTyFP9vqetWrxzHNLLDigPCYKRg0M8BgiWZrx2bd7iCUNuZReefQvQ8HEsbnverzcv3wl92EHizMZtnBku33Ei5YtEdwRixqbrSVhLtM0oUUbvp8hYFkAuUj9ZatlGaXoM=; 4:MZnMUHB14K7ESMrnF3LhWl3YpJsXp3ZMeTy+6JUpPAsMfA1u8MrQTA8PXWoey2n42rcspk/xGlIHx8TQpsi+NKhuX0W6IJ1GtTNHc/IyZBNtGyJr6jiuJHrzus7WXfVWJhcb/9/vW1cqtrzUoaUG2K8D+J9iLv9TeYofLVRH1ibHHgMMTcgMZ8u4fzAGg+iG66X6vlYYngZr7e/bQfCtR5ONmUSucUH3usBjm3X/xWZ2sTyR5sZwkt1okFatE18MiXjT66H2BrQgBKDlcH/tYvHowKtUBzVRXL3BAv45qdSmv19Dmda/hkqdCV3GRgRQ+Off7Y71Qq2FSqyKVEqIcDDFUdsNGJGpfNFuyAuywkOWEiKNVZDsi5drYdK9WkiD0XGgHT4CcBPlBl9I/8sQ8ZN0xyVCj7hnhHTSXurJHMIfREagq6XUyOZnjRb2TBoULo7AlvpZn+5qa8SSAMUxw5mOZvSk4x3iR2gP1eoMlYy/ZeiynsOjkSu5Jf4KmT5Z8/9zl/RWficZ+jVdU/lP/xM5StNiX46kPF49u4groJQ= 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:BLUPR0301MB2003; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR0301MB2003; X-Forefront-PRVS: 0058ABBBC7 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjAzMDFNQjIwMDM7MjM6eEw0ZjFJaTI5K0FjU21yQndRdm9tOWZZ?= =?utf-8?B?b2QxQkk3YTBSQlZCZ0V2Q1NiQkJidCsyTWNOZ2tUNnRoSHRuTWFEZGZJVWFn?= =?utf-8?B?RXB6b2F5N1g1Y1ZFeDNIV0tQZWV6N0MvVzMwTFo4dno2YzcrTVR6RHRxUjBY?= =?utf-8?B?VmNUc1AzY2FIam0rUDdYSHJoR1NvMGFCbkpDN0s0dWxDc1drdkFtOWp2Y0dZ?= =?utf-8?B?OGJYUTRGajlET2taNjFUemcxM1p1VmQrSFU0UGlPUG9uRWVZdFI4aFVORUNT?= =?utf-8?B?UnhZRmh3UHJITElGQWRMVzJrYWh2WEdpbm16R2JXN3gzd2Zsc2ZtUCtKWEpP?= =?utf-8?B?T29KYmFVMEpTdnNOQnIwaHZPcmxmWUpibW8wUldGRkc0NWVIeDczYW9oNndm?= =?utf-8?B?OXRMZWtlaFA3Z2Fxbk95Y01KWjRFQ1lwYkJJNERGSmdTdnd0MTgrL3RXekRN?= =?utf-8?B?QVcrQlBnZlNWOFg1OS9JbnJnSEZ5WlY2NjdBMncveFdyUHVIZm9Hdk93QjVT?= =?utf-8?B?aklPbWh5Wm9vWUpyYTYzQURsRTRNVjJldTA5L2hDOW8rL0I5SEUvYjNzN2hs?= =?utf-8?B?N3FTbHRuVHFkY3VJeFJyayt5ZjZxcmlYV0tvOHk3VmYyTHZnNlZJMG9kazM4?= =?utf-8?B?dW9raGdyTXNEYUpmcG1KSGtnVlhKQnFWQUl5cG0zK3lGSjM3WFY4Q0FrZG80?= =?utf-8?B?S09nT2lDOG1uVndrb3ZFbG9GY25GaHBBRk4yUnhpVlVMZG01VEpVSkNUbnQw?= =?utf-8?B?UkFJYm44R2dxakF0YURkTTZsS0hWOWdOQ3JWVDQ4S3NDdFBwV0FXUVVraVBx?= =?utf-8?B?a2d4b1lhMFBkYU9HRC9RV1RsWUpTWkxvcnJDYWl5c1d0UGp4ZU5kV1hkeVlU?= =?utf-8?B?OXh2UDMzeEk5aS9sMmxUaWVUTzdvYkdXVUMvK0NHdVNxMmNKcDVnNHJwOVBP?= =?utf-8?B?clN5elJaZTVTK2tveWtpcVNQUEtMVXE5bW50djdBRStHWGpRYTVtTVY1aTVO?= =?utf-8?B?NXJpS1hUS0UybHRLYmRUb0EybG4wUGdLS04yTktkUDgzTElaa3c2M3JvTkFD?= =?utf-8?B?K0ZpZWd1bG9MNlhTaU1jUSttTnVYa1JGSlg1UHdJbkg2dEMwNlgxdHBTREpp?= =?utf-8?B?dExsRU05ZXlmT3JpZG5jNmpPQ0krRkxVdGdIWld3Umt2cDBPeFBoZHNwbjUz?= =?utf-8?B?U1BPalk4MDhDV0hrSU5RNVpFRThBdFFmUUVKdDhKWGxlQ0VPOFdKMUl4bENz?= =?utf-8?B?WEE4UEdGbEx5bmR5aWEzQzNtQnFLS0JTUGhoa0YrMHJsVDJNenVRbFppeGJW?= =?utf-8?B?dGZ1OEl4alFLMk9hTFFpRzRQb1FYQ2tLbzdVUTQyOVFyNEVpNXVyeVIrNU5S?= =?utf-8?B?RC96NEZybVNwZFdLN0ZBRi8vK05aMXVWZExmUDRkWkt3SjFiZnc2V3VuWm9Z?= =?utf-8?B?TUREUnQrWXdZdEtqUUMvMG16dy9VeWlEMUMvaGhuTzkvTlVocFRoWGFJUzNw?= =?utf-8?B?VjZYS0thc3B6OUZ4QVBrRkN2cmlnOEp5a3F6UDQ2d0ZOdFdaTStiOHc1dFlq?= =?utf-8?Q?OZB?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2003; 6:EfNgd8Kh1olCdAEyT/sKjX4ZPh6EN40tdDrStQz2JNCIdeS66xbYZB+bWWe45ZviHeb7NbtnepkXbEaqDN474LuX2LBamImQHmiDLm8Z5AI68gcJmW6bt3GQNwxRpP2j9Vu7fMSU2w8U8EwEfXj1574Ry+7MMy4nA6DxBAR+Uaxf4N5Mb99hoCUOhvfQqlI7a72+1Ywayx0yWxffxw9CGFQOCLNIUMSwdFabxDAlysmPI/BugALSLWgtuASR3auIZXT7FIyYxj2KIcjtgf0ILSirrlHVtrjkdmdINMNh+mg=; 5:vi0ZrvI1tgYWEGVoLExm1NMbx7DacLSjQO/RDrW1dzC2XOjh+V3nAUKwjIVYvW0Uwxbn0NK4hhGlD2szW2VVItIfr8qFjV226VYgCvAW8UVgpjUyajGIM7rsc9wzZhbzUCFlJXEJbtwg0roP5tXxPIAjCXNRJbqmfG7pXG+nhF4=; 24:uTSpj+kOVIvtCL5Jv0ruw60VdpUQG2BGlqqiN3Qy/OH9w9yQCAQyOh1+ySoN4i9hUKxQdWPeE2HtdHexOivinhuMWYLK31v1RqfAw143eZQ=; 7:RnEOGWPawtQGauX7LTvRtOBBpMuOdNPp+w9tT6KXf5t+l3kSinV6ibNzVtH/8yuVtX9kzYS4qJx5wk+3NN91tUem0QiKaxkjo0+aKwDiPXaaoK9OFIJnxCLO4kLoZs+O4a3TUAxZmL00HWnClTa4A4XA0vwEtYcWxpwJR0K8waFia0m0PD5iKBEkt4nxBjeFVpLhTLBSBtOSHU9OrJBHj6W6uzEHdVGT+3sMBrJG1DzLiiczwWgM+amEL4aW5Wow SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2016 17:07:46.6461 (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: BLUPR0301MB2003 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160907_100810_478316_01A48468 X-CRM114-Status: GOOD ( 22.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 1c4b6c3bcf30 ("i2c: imx: implement bus recovery") the driver starts to use gpio/pinctrl to do i2c bus recovery. But pinctrl is not always available for platforms with this controller such as ls1021a and ls1043a, and the device tree binding also mentioned this gpio based recovery mechanism as optional. The patch makes it really optional that the probe function won't bailout but just disable the bus recovery function when pinctrl is not usable. Signed-off-by: Li Yang Cc: Gao Pan Cc: Uwe Kleine-König Acked-by: Linus Walleij --- 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 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 1844bc9..f52ff47 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -989,6 +989,14 @@ static void i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, { struct i2c_bus_recovery_info *rinfo = &i2c_imx->rinfo; + /* If pinctrl is not available disable bus recovery */ + if (IS_ERR(i2c_imx->pinctrl)) + i2c_imx->pinctrl = NULL; + if (!i2c_imx->pinctrl) { + dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n"); + return; + } + 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, @@ -1081,8 +1089,19 @@ static int i2c_imx_probe(struct platform_device *pdev) return ret; } + /* + * If pinctrl is available it might be possible to switch the + * SDA and SCL lines to their GPIO functions and do a recovery + * procedure in this mode. If there is anything wrong with + * pinctrl we cannot do this and simply not enable it. + */ i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev); - if (IS_ERR(i2c_imx->pinctrl)) { + /* + * Bailout on critical errors, continue for other errors. + * Bus recovery will not be enabled if pinctrl is not available. + */ + if (PTR_ERR(i2c_imx->pinctrl) == -ENOMEM || + PTR_ERR(i2c_imx->pinctrl) == -EPROBE_DEFER) { ret = PTR_ERR(i2c_imx->pinctrl); goto clk_disable; } @@ -1125,6 +1144,7 @@ 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); + /* Init bus recovery info if supported */ i2c_imx_init_recovery_info(i2c_imx, pdev); /* Add I2C adapter */