MLK-13441-14 pinctrl: imx: support i.mx7ulp new iomux format

On i.MX7ULP, IOMUX's mux and pad config are in
same register, but mux field is different, add
support in pinctrl driver.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index da8399b..d9474a6 100644 (file)
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -424,7 +424,7 @@ static int imx_pinconf_get(struct pinctrl_dev *pctldev,
        *config = readl(ipctl->base + pin_reg->conf_reg);
 
        if (info->flags & SHARE_MUX_CONF_REG)
-               *config &= 0xffff;
+               *config &= ~info->mux_mask;
 
        return 0;
 }
@@ -451,7 +451,7 @@ static int imx_pinconf_set(struct pinctrl_dev *pctldev,
                if (info->flags & SHARE_MUX_CONF_REG) {
                        u32 reg;
                        reg = readl(ipctl->base + pin_reg->conf_reg);
-                       reg &= ~0xffff;
+                       reg &= info->mux_mask;
                        reg |= configs[i];
                        writel(reg, ipctl->base + pin_reg->conf_reg);
                } else {