Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66b54e3a authored by Dong Aisheng's avatar Dong Aisheng Committed by Linus Walleij
Browse files

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.

Fixes: bf5a5309 ("pinctrl: imx: add VF610 support to imx pinctrl framework")
Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 49af64e6

drivers/pinctrl/freescale/pinctrl-imx.c

+8 −4
Original line number Diff line number Diff line
@@ -199,11 +199,13 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, 
			reg &= ~(0x7 << 20);

			reg |= (pin->mux_mode << 20);

			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->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->mux_mode);

		}



		/*

		 * If the select input value begins with 0xff, it's a quirky
@@ -405,11 +407,13 @@ static int imx_pinconf_set(struct pinctrl_dev *pctldev, 
			reg &= ~0xffff;

			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]);

		}

	} /* for each config */



	return 0;