From patchwork Sun Oct 23 21:51:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 13016456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0FF00C3A59D for ; Sun, 23 Oct 2022 21:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=afOsH0qQ1QiFSzqEi3ZSOuH+inNooungY3WKqhsZ0Jg=; b=VwLfKfBBBHdVK1 Z07SanrivXpUUzkLDl+zEZKDZctmDd5k3sp+BfvS807CPrJoeHIsBffShgbYDA/ch4LbkY8UjoGRg BteW6/KQspidCZ5A47A7dk9Ctqr7ESG7vPusNIpeJs0vNSTb5FbSI6Zcmfg+bO/inym/0ykDN8UVN Iz7czimKGCF44O+StUYRDbeL21CS6fOKG+7CUovXRGM3LnyT/v1UQO5rJAbVdRz+rQcebmTDfrand vgjGQW1hBEqNBpcfo3mJ71nm5+fCv3CbSFsuQ88Cnv6iGr/zPJwQEDIxIFiNTBNs+Yw73C8jERnSE 6lizddEhtreCEM65tZTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omisc-00GL6o-7Z; Sun, 23 Oct 2022 21:51:38 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omisX-00GL5o-TH for linux-arm-kernel@lists.infradead.org; Sun, 23 Oct 2022 21:51:36 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1omisQ-0006UJ-Lc; Sun, 23 Oct 2022 23:51:26 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1omisP-0012aw-DX; Sun, 23 Oct 2022 23:51:25 +0200 Received: from mgr by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omisO-000vaX-Sh; Sun, 23 Oct 2022 23:51:24 +0200 From: Michael Grzeschik To: linux-i2c@vger.kernel.org Cc: michal.simek@xilinx.com, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH] i2c: cadence: make bus recovery optional Date: Sun, 23 Oct 2022 23:51:21 +0200 Message-Id: <20221023215121.221316-1-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221023_145134_452784_49D96A57 X-CRM114-Status: GOOD ( 12.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no need for the i2c driver to have functional bus recovery to probe successfully. We patch this by only adding bus_recovery_info only if we get usable pinctrl data. Signed-off-by: Michael Grzeschik --- drivers/i2c/busses/i2c-cadence.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index fe0cd205502de9..cf212b8ffd56af 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c @@ -1262,10 +1262,10 @@ static int cdns_i2c_probe(struct platform_device *pdev) } id->rinfo.pinctrl = devm_pinctrl_get(&pdev->dev); - if (IS_ERR(id->rinfo.pinctrl)) { + if (!IS_ERR(id->rinfo.pinctrl)) + id->adap.bus_recovery_info = &id->rinfo; + else dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n"); - return PTR_ERR(id->rinfo.pinctrl); - } id->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem); if (IS_ERR(id->membase)) @@ -1283,7 +1283,6 @@ static int cdns_i2c_probe(struct platform_device *pdev) id->adap.retries = 3; /* Default retry value. */ id->adap.algo_data = id; id->adap.dev.parent = &pdev->dev; - id->adap.bus_recovery_info = &id->rinfo; init_completion(&id->xfer_done); snprintf(id->adap.name, sizeof(id->adap.name), "Cadence I2C at %08lx", (unsigned long)r_mem->start);