From patchwork Tue Oct 27 13:49:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289639 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, 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 CB70CC64E7B for ; Tue, 27 Oct 2020 15:44:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82E3D2244C for ; Tue, 27 Oct 2020 15:44:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813447; bh=Md3O5DTQzkoIj1mwL7MO+/Z/h2BT9RG++iSZMwWNMnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LHMKLSSegEI8wGikDOv4ewTNosRONMm79kMMKWxfq1NhUZAFOLEP0XE6xvY2t5aW4 nzAoJrq75ZtKqicTwtqgSC4vMWw+UjaY3u26cQLv0fs2rvvDO3SwGywClZG6roqLP2 z18o1Dfkqtrz0yzHCX8XkG+D9o9MIGhIgJP19JoI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1799610AbgJ0Pm3 (ORCPT ); Tue, 27 Oct 2020 11:42:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:53824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1800212AbgJ0PfW (ORCPT ); Tue, 27 Oct 2020 11:35:22 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 453B422264; Tue, 27 Oct 2020 15:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812921; bh=Md3O5DTQzkoIj1mwL7MO+/Z/h2BT9RG++iSZMwWNMnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ny+WpngsOSFoKiL/YIEo2XxF0BwFpbVq8Vu0asKp873nalB2jh4FdFIac1unrhp0Z LtROdCQvHiwVoIRcWOP6MBsL+mdzyD8tXZkcFEQKViJUZ8MQLJruw9I0Lh4NN6weEX u7XTrmgW+FNb5asrvIQ7vMjandSzaRV6oHXIKcu4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Jeffery , Joel Stanley , Johnny Huang , Linus Walleij , Sasha Levin Subject: [PATCH 5.9 346/757] pinctrl: aspeed: Use the right pinconf mask Date: Tue, 27 Oct 2020 14:49:56 +0100 Message-Id: <20201027135506.793265071@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrew Jeffery [ Upstream commit 1d6db5ae6b090d1a8edfcb36b9bf47c5f4fe27f6 ] The Aspeed pinconf data structures are split into 'conf' and 'map' types, where the 'conf' struct defines which register and bitfield to manipulate, while the 'map' struct defines what value to write to the register and bitfield. Both structs have a mask member, and the wrong mask was being used to tell the regmap which bits to update. A todo is to look at whether we can remove the mask from the 'map' struct. Fixes: 5f52c853847f ("pinctrl: aspeed: Use masks to describe pinconf bitfields") Signed-off-by: Andrew Jeffery Reviewed-by: Joel Stanley Cc: Johnny Huang Link: https://lore.kernel.org/r/20200910025631.2996342-3-andrew@aj.id.au Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/aspeed/pinctrl-aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c index 53f3f8aec6956..3e6567355d97d 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c @@ -534,7 +534,7 @@ int aspeed_pin_config_set(struct pinctrl_dev *pctldev, unsigned int offset, val = pmap->val << __ffs(pconf->mask); rc = regmap_update_bits(pdata->scu, pconf->reg, - pmap->mask, val); + pconf->mask, val); if (rc < 0) return rc;