diff options
| author | Andy Duan <fugang.duan@nxp.com> | 2016-05-09 17:48:35 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 5013ddd6e2c76bf31c12703e8a73c110c1bec088 (patch) | |
| tree | 94dd9f66c75c0bdba85c2c869de5e62002ba7bac /drivers/pinctrl | |
| parent | 3bbea09277d552161bc4f4c5b3061b1f01cae2d3 (diff) | |
MLK-13441-12 pinctrl: pinctrl-imx: add property to define mux register mask bits
Add property to define mux register mask bits when SHARE_MUX_CONF_REG
flag is added.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-imx.c | 10 | ||||
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-imx.h | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 7807e11d7cc2..da8399b6795f 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -204,6 +204,7 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, for (i = 0; i < npins; i++) { struct imx_pin *pin = &grp->pins[i]; + u32 mux_shift = info->mux_mask ? ffs(info->mux_mask) - 1 : 0; pin_id = pin->pin; pin_reg = &info->pin_regs[pin_id]; @@ -216,8 +217,8 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, if (info->flags & SHARE_MUX_CONF_REG) { u32 reg; reg = readl(ipctl->base + pin_reg->mux_reg); - reg &= ~(0x7 << 20); - reg |= (pin->mux_mode << 20); + reg &= ~info->mux_mask; + reg |= (pin->mux_mode << mux_shift); writel(reg, ipctl->base + pin_reg->mux_reg); } else { writel(pin->mux_mode, ipctl->base + pin_reg->mux_reg); @@ -335,7 +336,7 @@ static int imx_pmx_gpio_request_enable(struct pinctrl_dev *pctldev, mux_pin: reg = readl(ipctl->base + pin_reg->mux_reg); - reg &= ~(0x7 << 20); + reg &= ~info->mux_mask; reg |= imx_pin->config; writel(reg, ipctl->base + pin_reg->mux_reg); @@ -754,6 +755,9 @@ int imx_pinctrl_probe(struct platform_device *pdev, if (IS_ERR(ipctl->base)) return PTR_ERR(ipctl->base); + /* only for share mux and conf reg */ + of_property_read_u32(dev_np, "fsl,mux_mask", &info->mux_mask); + if (of_property_read_bool(dev_np, "fsl,input-sel")) { np = of_parse_phandle(dev_np, "fsl,input-sel", 0); if (!np) { diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h index 0a1866581dcf..aff5434d7cab 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.h +++ b/drivers/pinctrl/freescale/pinctrl-imx.h @@ -83,6 +83,7 @@ struct imx_pinctrl_soc_info { unsigned int nfunctions; unsigned int flags; const char *gpr_compatible; + unsigned int mux_mask; }; #define SHARE_MUX_CONF_REG 0x1 |