|
@@ -542,6 +542,9 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
|
|
|
struct imx_pin_reg *pin_reg;
|
|
|
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) {
|
|
|
conf_reg = mux_reg;
|
|
|
} else {
|
|
@@ -550,7 +553,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
|
|
|
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->pin = pin_id;
|
|
|
grp->pin_ids[i] = pin_id;
|