summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/nxp/pinctrl-imx.c
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2019-01-04 09:08:26 +0000
committerStefano Babic <sbabic@denx.de>2019-01-28 20:35:47 +0100
commit11a1c27eb454ece04ca4e61f0ea1ab4ebaafa5b5 (patch)
tree8c845839e078b0320d5892b7d01c7b98cf86de7c /drivers/pinctrl/nxp/pinctrl-imx.c
parent59ceb152f84811a89f9f23c52e4eb0c805b9d618 (diff)
pinctrl: imx: Fix select input issue
The pinctrl supports to set any bit in input register on iMX6 if the MSB of input value is 0xff. But the driver uses signed int for input value, so when executing the codes below, it won't meet. Because this is arithmetic right shift. if (input_val >> 24 == 0xff) Fix the issue by changing the input_val, config_val and mux_mode to u32. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Fugang Duan <fugang.duan@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'drivers/pinctrl/nxp/pinctrl-imx.c')
-rw-r--r--drivers/pinctrl/nxp/pinctrl-imx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index 04ea82aba5..0c9d15cb0c 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -22,7 +22,8 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
const struct fdt_property *prop;
u32 *pin_data;
int npins, size, pin_size;
- int mux_reg, conf_reg, input_reg, input_val, mux_mode, config_val;
+ int mux_reg, conf_reg, input_reg;
+ u32 input_val, mux_mode, config_val;
u32 mux_shift = info->mux_mask ? ffs(info->mux_mask) - 1 : 0;
int i, j = 0;