pinctrl: imx: fix using pin->input_val wrongly
authorPeter Chen <peter.chen@freescale.com>
Mon, 28 Oct 2013 06:01:16 +0000 (14:01 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 4 Nov 2013 12:04:26 +0000 (13:04 +0100)
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: Peter Chen <peter.chen@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-imx.c

index d78dd81..4779b8e 100644 (file)
@@ -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.