diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-30 07:22:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-30 07:22:12 -0500 |
| commit | 748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1 (patch) | |
| tree | 0067011f4422174e2834136f83ebe417dfa260d7 /drivers/pinctrl | |
| parent | 1b35c90836e5660a37ed33581f06ebb0b36b01ad (diff) | |
| parent | 6d69e535116ba9d6d3b8e4dc57cf3543301b59df (diff) | |
Merge tag 'u-boot-imx-20190129' of git://git.denx.de/u-boot-imx
For 2019.04
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/nxp/pinctrl-imx.c | 3 |
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; |