lkml.org 
[lkml]   [2016]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 108/125] pinctrl: qcom: fix masking of pinmux functions
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: John Crispin <john@phrozen.org>

    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 <john@phrozen.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Reviewed-by: Stephen Boyd <stephen.boyd@linaro.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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);


    \
     
     \ /
      Last update: 2016-10-29 16:01    [W:13.262 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site