From patchwork Fri Aug 19 22:05:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Li X-Patchwork-Id: 9291261 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 67CFB6077B for ; Fri, 19 Aug 2016 22:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 559E2295BE for ; Fri, 19 Aug 2016 22:13:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46166295C1; Fri, 19 Aug 2016 22:13:50 +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 839A3295BE for ; Fri, 19 Aug 2016 22:13:49 +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 1bas1H-0004aS-Un; Fri, 19 Aug 2016 22:12:07 +0000 Received: from mail-bn3nam01on0040.outbound.protection.outlook.com ([104.47.33.40] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1barye-0000xP-00 for linux-arm-kernel@lists.infradead.org; Fri, 19 Aug 2016 22:09:34 +0000 Received: from BLUPR0301CA0017.namprd03.prod.outlook.com (10.162.113.155) by BN3PR0301MB0835.namprd03.prod.outlook.com (10.160.154.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9; Fri, 19 Aug 2016 22:09:00 +0000 Received: from BN1BFFO11FD053.protection.gbl (2a01:111:f400:7c10::1:170) by BLUPR0301CA0017.outlook.office365.com (2a01:111:e400:5259::27) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9 via Frontend Transport; Fri, 19 Aug 2016 22:09:00 +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 BN1BFFO11FD053.mail.protection.outlook.com (10.58.145.8) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.577.8 via Frontend Transport; Fri, 19 Aug 2016 22:09:01 +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 u7JM90E3009253; Fri, 19 Aug 2016 15:09:00 -0700 From: Li Yang To: Wolfram Sang , , , , Subject: [PATCH v5] i2c: imx: make bus recovery through pinctrl optional Date: Fri, 19 Aug 2016 17:05:22 -0500 Message-ID: <1471644322-22670-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: 131161181412796139; (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)(1110001)(1109001)(339900001)(199003)(189002)(5001770100001)(87936001)(104016004)(8676002)(81156014)(81166006)(50466002)(4326007)(23676002)(2201001)(19580395003)(86362001)(5660300001)(19580405001)(77096005)(626004)(189998001)(92566002)(97736004)(36756003)(85426001)(5820100001)(105606002)(50986999)(8666005)(229853001)(47776003)(7846002)(356003)(305945005)(11100500001)(68736007)(2906002)(2870700001)(50226002)(586003)(106466001)(8936002)(33646002)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB0835; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD053; 1:kIrj9a4QhdJnA+ofeWQ7Gv4SO3vchEQUmITcbcLuWXaAbtM7HbX7Vmyk1/Qd3lCM9e0OBw4AGklzZhRhqCLAitjKg4upLPK0JYBuJhrMAq7o8llcGk/mK3jbwNOUsEuQxLM+qpZR4CsHgNV8ppsmqR5pMCq83wWELQss6dnbhrbY8IiylOmxD1PSSE7EMupLsJfT6i4TGQSi2EBYkW20H3LGM1cHrXbMD3S6S7UwXLnF+yntvTUnf2L0V+OloEBoHade+kdcRX7+GTE183Enq58tqr6eH5km3cwL/kai7RQOOeT4TuX8m0ZsrcAI1dWV9yQx42Px1WARMGIBMDSSJxZuSP0w2+iVjrOpwPYv1z/gHMhuvLG8kgVQaRWGijwzMIy/uU47cjpvFEOuMngy5hRBPJ0+laLjLS17SqGd1yWH6fcWXUD+9ybUitNgpkqwRN21HhBeuGloeypQo4lyw0u2m/TS3wbU330lKxSVTJlfESrACmImlm7/5lyMbCox0xJdJkfGEEjZ4i1Sqz5qKhGO7h3lO8HU+1ZT5/BIRaTK6lyfI6zW3ysmVCy18LFZtk6UFcpOZe4a9J8t5dSe4yxSFTUrwhwXZa2Tw2NJigIT7sEnwncyurRC2OBYnYHQ X-MS-Office365-Filtering-Correlation-Id: 31ad16e1-6819-4123-26eb-08d3c87d6ce5 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0835; 2:fuvo7O7y7q93ipelKFhtjTNHxpjETjrfTHCbv7zLtD8VSopqJTu0jTgWbTJHBCRJsOdu+f453OcCrcZqL5YTMr9O2QPAiKTBE39J55ovlNJBGqwmugx/fG5oE7Er9knVz6LLXyz3za4V/I2q5Z0O5xSPrNW04QRhYoTI957YcpLl7xcLUxJ/Mf5sTvaciSLr; 3:gSG+gTIkagNlFtrYGP9ooXTXAnNRI/Rf4Bu7AGpMrYSa6rvONl/tsiinjRgI2JzPv7tS7jnspWYHS06D0gj3a6BkF+tp5fnpKMklubZl5AcLmoIRaNb1OWziLxN8byLwHUONilfWRZBZdNg1YPn1d5FI8uhL0tQz8OkjCFQ+lwkPJ/VxEvn3HG+a19VlSn/z6ORfjCnH8Da8eWcKDUHAl/UH14rzlF/1QePOooqWR6I=; 25:ml1rnU38iL1ZX4NETb4srGnWcNTugNXw3QESjV0GMqWSLkDTTSy3no8yHJZuCB4QsRsgJ1aIS60lbkI7G69fPJwd/jrENr9cu1I+Ys4zJbuR0obgoBBr9avHibeVIEMh0Aecrmboair2KFXdC65V0Qj0BwzEkGoUtl9oV1tHM5+ZWDGahgbZAEDct4H+7WcKLTaM6OhOS8s1u9E1cjMH/CpsoZ7+wB6YQMRltYCTAPnMpbzdJRaRlZ1KmzNLU1B0wSr2lJEOY9cQBjHWKgLufYZ9d96UK2cpSN3Sfk8ML+BLC297hYeSnWdcBX+qCgN/ij/qox8UGpWdY2zvZ0aIq1QTW0EaNU7j4++4tH3TMyk39BTf7G8VFXsnwsAWaLGcD3dYW3mpSYlk+gIWeYcxgBygKZJF3EMfwytxEllzUAI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB0835; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0835; 31:gfgKwR4dOfG5s7Kywpi7IF8bp9z8E7ncj2Sr96jJzKsWbXtiM9IDxUH8pBCqrgMD6j1FiW9W1NLHQqjx1hWISivqy0X6+bqtEyxn1g10YUdkfrs60c0c9brwekwDQVKOkeTMyh/uLIsJDvz4QTlSzhYP096+oks9+2pqgSqoKc7ac+wwlrj/boaJ5KIx40XMpXXrqym6XRbBs1AexYyII6T028wWk8/pSnzkWQv3D8M=; 4:q1RjhoFX8VVbj8kKyqkj/jBTBa8agi7BD8izx3mYXpNECdrMWuwkz4GlIw4n7yB/qret20TDGYtqpVXQbpDCXCpyvj+ZVMJQRpYClCwg6qylZWKuOyLbBV17aplwoHTuXc8gYQoDiW3/tGvb4GME25xDkhwU7qfm4PbtGpPQWCH/xFlMa76m3ITWuwCHZ5waFuvcpNV0jD55bPqmnev5iLmCnYd8sy5iaLc2fECZZqooFJH6O0p+6o5FwfESZiODlD2Vx/3/tNxNsjyXbi2de4D2tIMsAXUnRoCBCFltdm++yvPjEFOEEMJxXCaa4yn8oTa2IAT+rSE6Eq2/OhpYZyQ8WoYK5cbM3EZMaTGj+h7vPJUytd3HCboix10YrnHJV7KjE7F89Zx9DtxnytP+L8BC59M+EFOo//S+Or6RvvVfYDJ0BjXm611uzgsTdQayiSQGY0MTw5QxpiYXa4/5/NVM91fnmYZG0M7vElXrd4ok7JRThnfzo21dHV1TQD7Xp/us6/FkeanDlNfFcuQ5hRcB0bA0LIyor+OM5I9ZlbQ= 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)(5005006)(13018025)(8121501046)(13015025)(13017025)(13024025)(13023025)(3002001)(10201501046)(6055026); SRVR:BN3PR0301MB0835; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR0301MB0835; X-Forefront-PRVS: 0039C6E5C5 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjNQUjAzMDFNQjA4MzU7MjM6QXZHVWRIZDVrVW9aVFJCblhQalFXM1d6?= =?utf-8?B?UmptcUEybk02WFFNWUFXeGNsNlNTcnNLL1ZTVEYyNU5XQWdoUFYwV3NoNm9N?= =?utf-8?B?UDRNTzYwTngvcGVWNENPTnoxQkFFRkhXTjFVUHhGQjZJcDFONmJDTjV2SWV0?= =?utf-8?B?OUgwQU1pdDFNSldGYk5NR0V6VkRLNDdZTGpOUzFYNzg5ZGFJT3pFSlVKMkpP?= =?utf-8?B?eTZIeEhFYmtuNHJ2NXk2ZGVJNWRsTjdEY2dnWW4xRk9FdkdJeXpDUzdOdTFV?= =?utf-8?B?eTdFeE4wY21lSE1pcGx1M3JSN25uZ1k0RyticnNpMW9jUXh2MEdmdXJKKzdF?= =?utf-8?B?TFZKTVNERmk0T3VDRzZZaWduSlBVbE9lYk01VHdMSGpORWgxZmhCMlZDZ2Mx?= =?utf-8?B?QVZnaGlRckUyMS9xdm1hMUg3dExMdGtDZk9JWHFaTEM4dDlmUDV4MG40QVNJ?= =?utf-8?B?SzdqRXFUL1FXbEsyelJlSTNIdy8zaDVhU1BxOWV3NmtzYk92R014cXRNN0ZK?= =?utf-8?B?bWxNNnJabE9OMTFsajhYMDY3VEJETVMzVG1hS3dpdGVBK281dldVRFFXZnpr?= =?utf-8?B?bFZSdlQ0c01JYXQrNllESkNuckdCeUs5ZE9oRkFCMlhMUG9RamNIcTZpSVlV?= =?utf-8?B?S0RaSFhlTFVTQm02R0NwcHhQWkFUMjQ0SnR4WGUxWXgrZVBFcWdDMm9QT2xx?= =?utf-8?B?dUkxUVAxOTdRaHFJdlBnNTZUZXBQdGU0elAvZXNLdFcrK3UwaER4c05uVUpx?= =?utf-8?B?Qy9jZmF5Nkh5Zzdoc1Jrb1JGVTF1WkYzWkZiRzZFRFBxc2Z2THVCZDVCclNS?= =?utf-8?B?N3pDTHE2UGVSSmhkZG5EelI5U29tT3hpT3FZK25Ib3ZvV1FiOFZlVUpBNWJm?= =?utf-8?B?UnVwMnFsQnFCcTl1MG1QVTI4Y2hCa0Q4OEZ2THNEbFZSTVhuNDMyWWx0NThJ?= =?utf-8?B?TjNjd2NZa3FRbmFNM2pLNHN2dWtLdW9sWUJyaHRGRFNzS2dYaXpMeER4d3dX?= =?utf-8?B?R0o1bWpvaUlRazkxZlJpQUFpeHIwdVhWeWcwYmZMUVVBY3pBZExVdzFkejBO?= =?utf-8?B?NUZ0eGltcTlPTmhvTjJSRHVYK2ZocGpweFV3eGQzUmpFWkExcS9Fa0ZMOXE3?= =?utf-8?B?WDljZWNVS01MYTJ6Mm82VTI1SG1TNGxoZnBpUXRhLzBoSUl2ZkpKUndYWldT?= =?utf-8?B?VzJoL2FsbFZrdFBURWlGdVlrbzJ3OUU0UlY3ZXlvNFZBUDl1Q3FvSys4NXZm?= =?utf-8?B?VUZTY0FtYXZ1UmtMOU0zT2xzeW5GdDF1U2J6VXgwb1h0ZTVIQ2R2VUtOZTBs?= =?utf-8?B?OC9LeHpmY2NQNGdudDJDMXh2dDVOZlpHeWtmdElrOU5vRlhXVUpxekZNQmR4?= =?utf-8?B?WmR4dWZ2K3JCYXdZK3ZueDZZbmNFOS9KeWVRNGNIclMwc1Q3ckxSbWQvVXcx?= =?utf-8?B?ZWpBRFY3Wi80RkE2QjIwUDlLaENXYkN4aTFwLzFuNi9WWU1nMXV4cU9iZnNu?= =?utf-8?B?ZGt0UzJHT1BQQWRUR1BRMCt3ZDJGTFI5a3p6SGl2Wm83VFI2b2Nxd2tmSnlt?= =?utf-8?B?MGsvQytmdlM5TGZlREptZ25UcGxXUFBHcU9TeWRzZkkyOGZnenRWYzg3ak5X?= =?utf-8?Q?s=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB0835; 6:ETfb8hVJ5gANSbUfjvxYcv+tir4tOjWEFC5YEMNOLvSr5bgX3IGIWcU9qDXNnmKB2WcGar2YPSVE7DJzt7P9bTUVAIzdBHGYIpLROlvkgoPDoXC3BnGsF7iOnOo5yhWzc7mtOl7PYdrktz/3vM9Kn3ErMkiYIFGDSoG10RutOt5kTwjpxXlnn0SChg8eJz5FJ0RpfK9/pEYUpKTqkl4feG9jiAb18oNIJY5sWkHWzhE4Gj35Xb0ZOmuzWobNS1ryyKrkff0XOBwvdgJHpbd9wwWa+ce7s67K9ZPfaKxuOM0=; 5:TJPqSLilEBwbeBhe4Fd5EZjrA9CPltueLq1NOI/ZHM/8b4wpzA8EJDjNHQpxAxY/YiVhK5YYovzGwJ1EqigiI6j+6oqJf6R1q/qZml9rqYO78SH59invkc/0Vu1gkKr+NNmSqP857nM7Z0FPAzV/Prymaf6SAHoW3fKA70i6T7g=; 24:1PUE+mb/0zLFuhL0LZJmweJD38tgjg3Cu67+3Sp0RWGTx1ygKIpd0bxqtTL5MA7HquwAtw/vu/dpix+EA0BhiqPJqLfCEZGGikVL1FccjQM=; 7:P5tzC0e+/WfthYypwFoeTBlWOOlOwnCI3HvomZgiD163TnfTmrIyo9Q2xfBJHsclwhNhWePlGYnhcYE6D4ZiWj0hSyNfx4ue5Ye3jKfe/HvePvP6ruZ9lHXFMQIRKZiwzzpghWDXiAr8mgEghAeEFxPW41rj2Jqos1cotvZfawi5wgPysMN0qTMZWr1YSvRXgnMqSUzcqXZlG1+yPLwiCE1M+fC9wNEd2b/lW6/xdnwQEsv2YmE5xjwwL8WXAGWW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2016 22:09:01.0924 (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: BN3PR0301MB0835 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160819_150924_804792_BECCA349 X-CRM114-Status: GOOD ( 18.81 ) 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 available. Signed-off-by: Li Yang Cc: Gao Pan Cc: Uwe Kleine-König Acked-by: Linus Walleij --- 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 1844bc9..7ae7992 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -989,6 +989,15 @@ 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 supported on the system */ + 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 +1090,11 @@ static int i2c_imx_probe(struct platform_device *pdev) return ret; } + /* optional bus recovery feature through pinctrl */ i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev); - if (IS_ERR(i2c_imx->pinctrl)) { + /* bailout on -ENOMEM or -EPROBE_DEFER, continue for other errors */ + 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 +1137,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 */