iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: freescale: imx: allow mux_reg offset zero

Browse Source 
Allow mux_reg offset zero to be a valid pin_id, on imx7d
mux_conf reg offset is zero for iomuxc-lspr controller

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Adrian Alonso 2015-09-25 16:05:59 -05:00 committed by Linus Walleij
parent ee1635180a
commit e7b37a522a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pinctrl/freescale/pinctrl-imx.c
View File

@ -542,6 +542,9 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
struct imx_pin_reg *pin_reg; struct imx_pin_reg *pin_reg;
struct imx_pin *pin = &grp->pins[i]; struct imx_pin *pin = &grp->pins[i];
if (!(info->flags & ZERO_OFFSET_VALID) && !mux_reg)
mux_reg = -1;
if (info->flags & SHARE_MUX_CONF_REG) { if (info->flags & SHARE_MUX_CONF_REG) {
conf_reg = mux_reg; conf_reg = mux_reg;
} else { } else {
@ -550,7 +553,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
conf_reg = -1; conf_reg = -1;
} }
pin_id = mux_reg ? mux_reg / 4 : conf_reg / 4; pin_id = (mux_reg != -1) ? mux_reg / 4 : conf_reg / 4;
pin_reg = &info->pin_regs[pin_id]; pin_reg = &info->pin_regs[pin_id];
pin->pin = pin_id; pin->pin = pin_id;
grp->pin_ids[i] = pin_id; grp->pin_ids[i] = pin_id;

1
drivers/pinctrl/freescale/pinctrl-imx.h
View File

@ -85,6 +85,7 @@ struct imx_pinctrl_soc_info {
}; };
#define SHARE_MUX_CONF_REG 0x1 #define SHARE_MUX_CONF_REG 0x1
#define ZERO_OFFSET_VALID 0x2
#define NO_MUX 0x0 #define NO_MUX 0x0
#define NO_PAD 0x0 #define NO_PAD 0x0