From patchwork Fri Jun 30 00:54:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 9818227 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 8385F602B1 for ; Fri, 30 Jun 2017 00:54:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 716A02851A for ; Fri, 30 Jun 2017 00:54:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 667AC2851F; Fri, 30 Jun 2017 00:54:48 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 190D72851A for ; Fri, 30 Jun 2017 00:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751577AbdF3AyY (ORCPT ); Thu, 29 Jun 2017 20:54:24 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:46148 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683AbdF3AyU (ORCPT ); Thu, 29 Jun 2017 20:54:20 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id E978A84482; Fri, 30 Jun 2017 12:54:17 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail; t=1498784057; bh=43E5FL1YDztq9JI6LfCIPQPtamBIzk0ib5ryUChO9nM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AEPSAi4qZQq6+p163V3XZkROFOKht67l2a8Ezyoz5Fj+iKmuY4+AOFp+HhiN2OsZ0 Qw93RLLjxvBsmbBRPnaBjCVVBr+40gZWrgoyOJAPV7g7Z+1VtDwr1ZggleX2Nqw9wf lLkag5IwEMuk/RUxbqNCqm1AG2TBxEKblfQ+OwvM= Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 7, 9061) id ; Fri, 30 Jun 2017 12:54:17 +1200 Received: from chrisp-dl.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id 7F8CA13F08E; Fri, 30 Jun 2017 12:54:21 +1200 (NZST) Received: by chrisp-dl.atlnz.lc (Postfix, from userid 1030) id 872B91E1D80; Fri, 30 Jun 2017 12:54:16 +1200 (NZST) From: Chris Packham To: wsa@the-dreams.de, andy.shevchenko@gmail.com, linux-i2c@vger.kernel.org Cc: ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, Chris Packham , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] i2c: pca-platform: correctly set algo_data.reset_chip Date: Fri, 30 Jun 2017 12:54:04 +1200 Message-Id: <20170630005408.23968-3-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> References: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When device tree support was added the setting of algo_data.reset_chip was moved. There were two problems with this. The first being that i2c_pca_pf_resetchip was only used if platform data was provided. The second that it was unconditionally overridden with i2c_pca_pf_dummyreset. Ensure that however the reset gpio is defined the correct reset_chip function is used. Fixes: commit 4cc7229daa46 ("i2c: pca-platform: switch to struct gpio_desc") Signed-off-by: Chris Packham --- drivers/i2c/busses/i2c-pca-platform.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c index 395eca0cbb1f..daccef6865e8 100644 --- a/drivers/i2c/busses/i2c-pca-platform.c +++ b/drivers/i2c/busses/i2c-pca-platform.c @@ -184,7 +184,6 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) if (ret == 0) { i2c->gpio = gpio_to_desc(platform_data->gpio); gpiod_direction_output(i2c->gpio, 0); - i2c->algo_data.reset_chip = i2c_pca_pf_resetchip; } else { dev_warn(&pdev->dev, "Registering gpio failed!\n"); i2c->gpio = NULL; @@ -205,7 +204,10 @@ static int i2c_pca_pf_probe(struct platform_device *pdev) i2c->algo_data.data = i2c; i2c->algo_data.wait_for_completion = i2c_pca_pf_waitforcompletion; - i2c->algo_data.reset_chip = i2c_pca_pf_dummyreset; + if (i2c->gpio) + i2c->algo_data.reset_chip = i2c_pca_pf_resetchip; + else + i2c->algo_data.reset_chip = i2c_pca_pf_dummyreset; switch (res->flags & IORESOURCE_MEM_TYPE_MASK) { case IORESOURCE_MEM_32BIT: