From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48514 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934957AbcJ2NUj (ORCPT ); Sat, 29 Oct 2016 09:20:39 -0400 Subject: Patch "pinctrl: qcom: fix masking of pinmux functions" has been added to the 4.8-stable tree To: john@phrozen.org, bjorn.andersson@linaro.org, gregkh@linuxfoundation.org, linus.walleij@linaro.org, stephen.boyd@linaro.org Cc: , From: Date: Sat, 29 Oct 2016 09:20:24 -0400 Message-ID: <1477747224143236@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled pinctrl: qcom: fix masking of pinmux functions to the 4.8-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: pinctrl-qcom-fix-masking-of-pinmux-functions.patch and it can be found in the queue-4.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 6bcf3f63394b9c4f133e4499349d786d7f531473 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 12 Sep 2016 11:36:55 +0200 Subject: pinctrl: qcom: fix masking of pinmux functions From: John Crispin commit 6bcf3f63394b9c4f133e4499349d786d7f531473 upstream. The following commit introduced a regression by not properly masking the calculated value. Fixes: 47a01ee9a6c3 ("pinctrl: qcom: Clear all function selection bits") Signed-off-by: John Crispin Reviewed-by: Bjorn Andersson Reviewed-by: Stephen Boyd Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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 pin 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); Patches currently in stable-queue which might be from john@phrozen.org are queue-4.8/pinctrl-qcom-fix-masking-of-pinmux-functions.patch