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=-13.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A26B3C43612 for ; Fri, 11 Jan 2019 14:35:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AA7A204EC for ; Fri, 11 Jan 2019 14:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217324; bh=VfcdOLY1LpxFnRwKc0I6y/dbBp+3jZYTWLVy+o32NOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Jb5q+99wZj1NwlU5wD9cCDYfdmTcDwUAiKqBpZLAzkJbPyX6sGybAYR37IUYZK8su uFxWbPc/F/kBmQd8ZQV5v3afv9LUhZWVd74HdYkd+6rojdzqCdFul1Sv0PRzWUi2Tk QPSNwEIc5RpbuIJh/CYWyJ2p+Z9lTMPsoZ280vLk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390130AbfAKOfX (ORCPT ); Fri, 11 Jan 2019 09:35:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:55642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389389AbfAKOfX (ORCPT ); Fri, 11 Jan 2019 09:35:23 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA3C02063F; Fri, 11 Jan 2019 14:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217322; bh=VfcdOLY1LpxFnRwKc0I6y/dbBp+3jZYTWLVy+o32NOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WVhxVKWkgCLJswoJ2Yy0a19SjGE1YdfKh1lHtgBhgBSKMHt+HZXMcDZQzXUMOKGmW vvKPGXDwGE+qVBw586200NIUkY5NBG5yThyX1MJ47VE7Ly6Pt25jCcogPpRV2kFmSR 9RptyRFj8sX+LbOj48UxMH8C73lJdi7UrAsH44Mw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Neil Armstrong , Linus Walleij , Sasha Levin Subject: [PATCH 4.19 002/148] pinctrl: meson: fix pull enable register calculation Date: Fri, 11 Jan 2019 15:13:00 +0100 Message-Id: <20190111131114.432881999@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131114.337122649@linuxfoundation.org> References: <20190111131114.337122649@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 614b1868a125a0ba24be08f3a7fa832ddcde6bca ] We just changed the code so we apply bias disable on the correct register but forgot to align the register calculation. The result is that we apply the change on the correct register, but possibly at the incorrect offset/bit This went undetected because offsets tends to be the same between REG_PULL and REG_PULLEN for a given pin the EE controller. This is not true for the AO controller. Fixes: e39f9dd8206a ("pinctrl: meson: fix pinconf bias disable") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/meson/pinctrl-meson.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 4f3ab18636a3..c8eff70fdb1c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -191,7 +191,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, case PIN_CONFIG_BIAS_DISABLE: dev_dbg(pc->dev, "pin %u: disable bias\n", pin); - meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit); + meson_calc_reg_and_bit(bank, pin, REG_PULLEN, ®, + &bit); ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0); if (ret) -- 2.19.1