diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2017-05-19 15:05:41 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 8fc7240d9da220cac341ffbf9e81f1a91e9e60a2 (patch) | |
| tree | 9d25adbbaf61173849252cbe693bfa5b2ef53af7 /drivers/pinctrl/freescale | |
| parent | eb7b0bb4e6c66e2a931f0d45909fb7a7bbe336c5 (diff) | |
MLK-17491-6 pinctrl: imx: fix debug message for SHARE_MUX_CONF_REG case
The original implemented debug message does not work for
SHARE_MUX_CONF_REG case. This patch fixes it.
[ Aisheng: fix merge conflict ]
Fixes: bf5a530971af ("pinctrl: imx: add VF610 support to imx pinctrl framework")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/freescale')
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-memmap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-memmap.c b/drivers/pinctrl/freescale/pinctrl-memmap.c index 323b7da07ac3..3f73ba45ac75 100644 --- a/drivers/pinctrl/freescale/pinctrl-memmap.c +++ b/drivers/pinctrl/freescale/pinctrl-memmap.c @@ -55,11 +55,13 @@ int imx_pmx_set_one_pin_mem(struct imx_pinctrl *ipctl, struct imx_pin *pin) reg &= ~info->mux_mask; reg |= (pin_memmap->mux_mode << mux_shift); writel(reg, ipctl->base + pin_reg->mux_reg); + dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%x\n", + pin_reg->mux_reg, reg); } else { writel(pin_memmap->mux_mode, ipctl->base + pin_reg->mux_reg); + dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%x\n", + pin_reg->mux_reg, pin_memmap->mux_mode); } - dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%x\n", - pin_reg->mux_reg, pin_memmap->mux_mode); /* * If the select input value begins with 0xff, it's a quirky @@ -262,11 +264,13 @@ int imx_pinconf_backend_set_mem(struct pinctrl_dev *pctldev, reg &= info->mux_mask; reg |= configs[i]; writel(reg, ipctl->base + pin_reg->conf_reg); + dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%x\n", + pin_reg->conf_reg, reg); } else { writel(configs[i], ipctl->base + pin_reg->conf_reg); + dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%lx\n", + pin_reg->conf_reg, configs[i]); } - dev_dbg(ipctl->dev, "write: offset 0x%x val 0x%lx\n", - pin_reg->conf_reg, configs[i]); } /* for each config */ return 0; |