From patchwork Mon Sep 12 09:36:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 668690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sXjQc3Gd3z9sC4 for ; Mon, 12 Sep 2016 19:37:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756383AbcILJhn (ORCPT ); Mon, 12 Sep 2016 05:37:43 -0400 Received: from nbd.name ([46.4.11.11]:50232 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754615AbcILJhm (ORCPT ); Mon, 12 Sep 2016 05:37:42 -0400 From: John Crispin To: Linus Walleij , Stephen Boyd Cc: Bjorn Andersson , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, John Crispin Subject: [PATCH] pinctrl: qcom: fix masking of pinmux functions Date: Mon, 12 Sep 2016 11:36:55 +0200 Message-Id: <1473673015-33124-1-git-send-email-john@phrozen.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The following commit introduced a regression by not properly masking the calculated value. commit 47a01ee9a6c39fe1 ("pinctrl: qcom: Clear all function selection bits") Signed-off-by: John Crispin Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 51c42d7..775c883 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -156,7 +156,7 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev, spin_lock_irqsave(&pctrl->lock, flags); val = readl(pctrl->regs + g->ctl_reg); - val &= mask; + val &= ~mask; val |= i << g->mux_bit; writel(val, pctrl->regs + g->ctl_reg);