Message ID | 1502705357-2896-1-git-send-email-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | 63fbc59b4f14e6c19b203cca894226874fe68998 |
Delegated to: | Stefano Babic |
Headers | show |
On 14/08/2017 12:09, Peng Fan wrote: > when using SHARE_MUX_CONF_REG, wrong mask is used for > writing config value, which causes mux value is cleared. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stefano Babic <sbabic@denx.de> > --- > drivers/pinctrl/nxp/pinctrl-imx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c > index 1b6107f..32cbac9 100644 > --- a/drivers/pinctrl/nxp/pinctrl-imx.c > +++ b/drivers/pinctrl/nxp/pinctrl-imx.c > @@ -158,7 +158,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) > if (!(config_val & IMX_NO_PAD_CTL)) { > if (info->flags & SHARE_MUX_CONF_REG) { > clrsetbits_le32(info->base + conf_reg, > - info->mux_mask, config_val); > + ~info->mux_mask, config_val); > } else { > writel(config_val, info->base + conf_reg); > } > Applied to u-boot-imx, -master, thanks ! Best regards, Stefano Babic
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c index 1b6107f..32cbac9 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.c +++ b/drivers/pinctrl/nxp/pinctrl-imx.c @@ -158,7 +158,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) if (!(config_val & IMX_NO_PAD_CTL)) { if (info->flags & SHARE_MUX_CONF_REG) { clrsetbits_le32(info->base + conf_reg, - info->mux_mask, config_val); + ~info->mux_mask, config_val); } else { writel(config_val, info->base + conf_reg); }
when using SHARE_MUX_CONF_REG, wrong mask is used for writing config value, which causes mux value is cleared. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stefano Babic <sbabic@denx.de> --- drivers/pinctrl/nxp/pinctrl-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)