From patchwork Tue Dec 6 14:08:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9462635 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 64B6F60231 for ; Tue, 6 Dec 2016 14:08:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52E8E283F5 for ; Tue, 6 Dec 2016 14:08:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 460D1283F7; Tue, 6 Dec 2016 14:08:59 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 E06D3283F5 for ; Tue, 6 Dec 2016 14:08:58 +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 1cEGQM-0002HH-OG; Tue, 06 Dec 2016 14:08:50 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEGQJ-00029Y-KT for linux-amlogic@lists.infradead.org; Tue, 06 Dec 2016 14:08:48 +0000 Received: by mail-wm0-x22c.google.com with SMTP id f82so127191050wmf.1 for ; Tue, 06 Dec 2016 06:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=aeHf6HXYoMoscjdq1CCwXYCc37TGiErk0V26sXTKYLI=; b=PvyR4o491vo07TJtVkwb5eB5N8hi8Rw7liYYVG/0jHWZGFogYTdIYgEVSuigoUXELx eThdBcPtEoPPQN8Ju0Tv3l3MigyJq9rqAyY0T5jawJg3qXRDI1DPdcF3JM6UE9C3GelF GayOJN8NupyrMQiKR+peAMgtofIw7LQDhQKMpNEuQ+fvEd2YI/WiA45dIl0uxx4IEdC0 BBHXAyOox5djHtC7QJqK3QPmKTsaZ+1QpRHgjuSudwOmpQP0ek4/brQaz58L0Fjvsdz8 S55tokLpolZ399AKprBjyu0SuetrN53pEYmBicGRHs5TrK3douwnt5tsicqBA8XrzlW3 mbKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aeHf6HXYoMoscjdq1CCwXYCc37TGiErk0V26sXTKYLI=; b=AZzrwEUadYmRfQ8VfwX3EYVmrr9g6CDCXbdQq2s1Whn55eO5kWuJCij/oPCeFIURBn mtZs7ogFGWesW3GgTZkpW/8w56RTPO2/XFkKEszaUpHtpaeds+r3hp4h8GsEfJTqY5+I FUmffhwMJYz3fmzsIwH+cwU7iMqKdpTO6gewDteXFal70l536LWPvPgzYAAmoEVlvTEC kXYrKTXwbdPkTZCHrrCYWeCLJo3PXm87OAt+MPlyz3m0LT/WGjcpGXPiB7ZKJBf+1eYc V5SlWnJVm7y9A0Y/u3mZ7cWCHzyDlb3AwLz0gfCxAqoW9LGP3pQ4dGd92B8ibbnjmhRv koJQ== X-Gm-Message-State: AKaTC0290HRdD3lWxY/YDpq67TocqNv5Zq8fflaIYmLGZx4LyvzNFgcXfiBI5U8R6v6g5ap5 X-Received: by 10.28.220.197 with SMTP id t188mr2783860wmg.57.1481033305777; Tue, 06 Dec 2016 06:08:25 -0800 (PST) Received: from build.net (build.baylibre.com. [37.187.146.144]) by smtp.gmail.com with ESMTPSA id l2sm25989937wji.7.2016.12.06.06.08.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2016 06:08:25 -0800 (PST) From: Neil Armstrong To: linus.walleij@linaro.org, carlo@caione.org, khilman@baylibre.com Subject: [PATCH] pinctrl: meson: fix gpio request disabling other modes Date: Tue, 6 Dec 2016 15:08:16 +0100 Message-Id: <20161206140817.11708-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_060847_920627_7008240B X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , linux-kernel@vger.kernel.org, Beniamino Galvani , linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The pinctrl_gpio_request is called with the "full" gpio number, already containing the base, then meson_pmx_request_gpio is then called with the final pin number. Remove the base addition when calling meson_pmx_disable_other_groups. Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") CC: Beniamino Galvani Signed-off-by: Neil Armstrong Acked-by: Kevin Hilman Acked-by: Beniamino Galvani --- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index a579126..620c231a 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -212,7 +212,7 @@ static int meson_pmx_request_gpio(struct pinctrl_dev *pcdev, { struct meson_pinctrl *pc = pinctrl_dev_get_drvdata(pcdev); - meson_pmx_disable_other_groups(pc, range->pin_base + offset, -1); + meson_pmx_disable_other_groups(pc, offset, -1); return 0; }