From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54728C06510 for ; Wed, 3 Jul 2019 02:21:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20D5221874 for ; Wed, 3 Jul 2019 02:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562120511; bh=PUuHdxl7TTy7bW0AsWJdX81k6IKf5IQiWJ1Ej54CLrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ls7di8vVijlwCwAT6cL1KiI5ItZ9SdTriiIm3JmDBgLbf7mVLxU+jIWVESXDUsoKz xoXzi3uZOenc0CroDj4X+k1RQhQB1EYn/InPqHOzih5pQC7KHbEaSH6vgIAbWRQV2C 8XlMM2hAcMaz4GVz6OqUWBpzGOyEL+7ipJlgwYDc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727747AbfGCCPv (ORCPT ); Tue, 2 Jul 2019 22:15:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:54164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727742AbfGCCPu (ORCPT ); Tue, 2 Jul 2019 22:15:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23E0B21880; Wed, 3 Jul 2019 02:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562120149; bh=PUuHdxl7TTy7bW0AsWJdX81k6IKf5IQiWJ1Ej54CLrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=drcCmHhEYgLYkbyybfuvhizTPaA1sQxvFbJGFwopM2D1uxqW6LaIiD2+HBRLxSV6d ejzzH8F2B2H8jJqd5IE4CAQ3xct8NsR79dbiKegAsQiZ2l5P0b/nmORhtz9fs8vuIx C3njSGFsOwRmsp25ybk7XhozB8vaqL798PyHguPA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexandre Belloni , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 24/39] pinctrl: ocelot: fix gpio direction for pins after 31 Date: Tue, 2 Jul 2019 22:14:59 -0400 Message-Id: <20190703021514.17727-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703021514.17727-1-sashal@kernel.org> References: <20190703021514.17727-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Alexandre Belloni [ Upstream commit f2818ba3a0125670cb9999bb5a65ebb631a8da2f ] The third argument passed to REG is not the correct one and ocelot_gpio_set_direction is not working for pins after 31. Fix that by passing the pin number instead of the modulo 32 value. Fixes: da801ab56ad8 pinctrl: ocelot: add MSCC Jaguar2 support Signed-off-by: Alexandre Belloni Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/pinctrl-ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index 3b4ca52d2456..d2478db975bd 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -432,7 +432,7 @@ static int ocelot_gpio_set_direction(struct pinctrl_dev *pctldev, struct ocelot_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); unsigned int p = pin % 32; - regmap_update_bits(info->map, REG(OCELOT_GPIO_OE, info, p), BIT(p), + regmap_update_bits(info->map, REG(OCELOT_GPIO_OE, info, pin), BIT(p), input ? 0 : BIT(p)); return 0; -- 2.20.1