summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/pinctrl-imx.c
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2013-10-28 10:01:16 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-11-04 16:04:26 +0400
commita3183c60e3e9be7abd830ebed904491625e07d2e (patch)
treec239ffbf13c997952bd86f08bbc788324be2e5bc /drivers/pinctrl/pinctrl-imx.c
parentde91a3789d8ea2ba7a677c6355b703ded59751ad (diff)
downloadlinux-a3183c60e3e9be7abd830ebed904491625e07d2e.tar.xz
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: Peter Chen <peter.chen@freescale.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx.c')
-rw-r--r--drivers/pinctrl/pinctrl-imx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index d78dd813bff9..4779b8e0eee8 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -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.