Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-imx.c

diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index d78dd813bff978d87f9bedd38f403f816db73e76..4779b8e0eee8f1cb90037e78fff60a7f53e9a1ad 100644 (file)
--- 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.