lkml.org 
[lkml]   [2013]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] pinctrl: single: fix pcs_disable with bits_per_mux
* Tony Lindgren <tony@atomide.com> [131130 09:08]:
> * Peter Ujfalusi <peter.ujfalusi@ti.com> [131128 04:01]:
> > On 11/28/2013 01:29 PM, Tomi Valkeinen wrote:
> > > pcs_enable() uses vals->mask instead of pcs->fmask when bits_per_mux is
> > > enabled. However, pcs_disable() always uses pcs->fmask.
> > >
> > > Fix pcs_disable() to use vals->mask with bits_per_mux.
> >
> > I wonder how did I missed this?
>
> Probably because the disable can be a nop for some hardware.
>
> > Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Linus W, might be worth also mentioning the regression causing commit
here. Commit 9e605cb68a21d5 (pinctrl: pinctrl-single: Add
pinctrl-single,bits type of mux) added support for multiple muxes
in a single register, but forgot to modify pcs_disable() function the
same way as pcs_enable() was modified.

> Acked-by: Tony Lindgren <tony@atomide.com>
>
>
> > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> > > ---
> > > drivers/pinctrl/pinctrl-single.c | 10 ++++++++--
> > > 1 file changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> > > index 829b98c5c66f..174f4c50cd77 100644
> > > --- a/drivers/pinctrl/pinctrl-single.c
> > > +++ b/drivers/pinctrl/pinctrl-single.c
> > > @@ -525,12 +525,18 @@ static void pcs_disable(struct pinctrl_dev *pctldev, unsigned fselector,
> > > for (i = 0; i < func->nvals; i++) {
> > > struct pcs_func_vals *vals;
> > > unsigned long flags;
> > > - unsigned val;
> > > + unsigned val, mask;
> > >
> > > vals = &func->vals[i];
> > > raw_spin_lock_irqsave(&pcs->lock, flags);
> > > val = pcs->read(vals->reg);
> > > - val &= ~pcs->fmask;
> > > +
> > > + if (pcs->bits_per_mux)
> > > + mask = vals->mask;
> > > + else
> > > + mask = pcs->fmask;
> > > +
> > > + val &= ~mask;
> > > val |= pcs->foff << pcs->fshift;
> > > pcs->write(val, vals->reg);
> > > raw_spin_unlock_irqrestore(&pcs->lock, flags);
> > >
> >
> >
> > --
> > Péter
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2013-11-30 18:41    [W:0.038 / U:0.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site