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

Commit a3183c60 authored by Peter Chen's avatar Peter Chen Committed by Linus Walleij
Browse files

pinctrl: imx: fix using pin->input_val wrongly 



The commit: "pinctrl: imx: Use struct type for pins" relaced
pin->input_reg by pin->input_val wrongly, fix it at this commit.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent de91a378

drivers/pinctrl/pinctrl-imx.c

+3 −3
Original line number Diff line number Diff line
@@ -245,11 +245,11 @@ static int imx_pmx_enable(struct pinctrl_dev *pctldev, unsigned selector, 
			 * The input_reg[i] here is actually some IOMUXC general

			 * purpose register, not regular select input register.

			 */

			val = readl(ipctl->base + pin->input_val);

			val = readl(ipctl->base + pin->input_reg);

			val &= ~mask;

			val |= select << shift;

			writel(val, ipctl->base + pin->input_val);

		} else if (pin->input_val) {

			writel(val, ipctl->base + pin->input_reg);

		} else if (pin->input_reg) {

			/*

			 * Regular select input register can never be at offset

			 * 0, and we only print register value for regular case.