Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd4c2b3c authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Linus Walleij
Browse files

pinctrl: single: fix pcs_disable with bits_per_mux 



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.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2bce6954

drivers/pinctrl/pinctrl-single.c

+8 −2
Original line number Diff line number Diff line
@@ -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);