diff options
| author | Peter Chen <peter.chen@freescale.com> | 2013-10-28 02:01:16 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-04 07:04:26 -0500 |
| commit | a3183c60e3e9be7abd830ebed904491625e07d2e (patch) | |
| tree | c239ffbf13c997952bd86f08bbc788324be2e5bc | |
| parent | de91a3789d8ea2ba7a677c6355b703ded59751ad (diff) | |
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>
| -rw-r--r-- | drivers/pinctrl/pinctrl-imx.c | 6 |
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, | |||
| 245 | * The input_reg[i] here is actually some IOMUXC general | 245 | * The input_reg[i] here is actually some IOMUXC general |
| 246 | * purpose register, not regular select input register. | 246 | * purpose register, not regular select input register. |
| 247 | */ | 247 | */ |
| 248 | val = readl(ipctl->base + pin->input_val); | 248 | val = readl(ipctl->base + pin->input_reg); |
| 249 | val &= ~mask; | 249 | val &= ~mask; |
| 250 | val |= select << shift; | 250 | val |= select << shift; |
| 251 | writel(val, ipctl->base + pin->input_val); | 251 | writel(val, ipctl->base + pin->input_reg); |
| 252 | } else if (pin->input_val) { | 252 | } else if (pin->input_reg) { |
| 253 | /* | 253 | /* |
| 254 | * Regular select input register can never be at offset | 254 | * Regular select input register can never be at offset |
| 255 | * 0, and we only print register value for regular case. | 255 | * 0, and we only print register value for regular case. |
