| Message ID | 20180109055902.GA1306@arx-s1 |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND] ARM: pinctrl: sunxi-pinctrl: fix pin funtion can not be match correctly. | expand |
On Tue, Jan 09, 2018 at 01:59:02PM +0800, hao_zhang wrote: > Pin function can not be match correctly when SUNXI_PIN describe with > mutiple variant and same function. > > such as: > on pinctrl-sun4i-a10.c > > SUNXI_PIN(SUNXI_PINCTRL_PIN(B, 2), > SUNXI_FUNCTION(0x0, "gpio_in"), > SUNXI_FUNCTION(0x1, "gpio_out"), > SUNXI_FUNCTION_VARIANT(0x2, "pwm", /* PWM0 */ > PINCTRL_SUN4I_A10 | > PINCTRL_SUN7I_A20), > SUNXI_FUNCTION_VARIANT(0x3, "pwm", /* PWM0 */ > PINCTRL_SUN8I_R40)), > > it would always match to the first variant function > (PINCTRL_SUN4I_A10, PINCTRL_SUN7I_A20) > > so we should add variant compare on it. > > Regards > Hao > > Signed-off-by: hao_zhang <hao5781286@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Maxime
On Tue, Jan 9, 2018 at 6:59 AM, hao_zhang <hao5781286@gmail.com> wrote: > Pin function can not be match correctly when SUNXI_PIN describe with > mutiple variant and same function. > > such as: > on pinctrl-sun4i-a10.c > > SUNXI_PIN(SUNXI_PINCTRL_PIN(B, 2), > SUNXI_FUNCTION(0x0, "gpio_in"), > SUNXI_FUNCTION(0x1, "gpio_out"), > SUNXI_FUNCTION_VARIANT(0x2, "pwm", /* PWM0 */ > PINCTRL_SUN4I_A10 | > PINCTRL_SUN7I_A20), > SUNXI_FUNCTION_VARIANT(0x3, "pwm", /* PWM0 */ > PINCTRL_SUN8I_R40)), > > it would always match to the first variant function > (PINCTRL_SUN4I_A10, PINCTRL_SUN7I_A20) > > so we should add variant compare on it. > > Regards > Hao > > Signed-off-by: hao_zhang <hao5781286@gmail.com> Patch applied with Maxime's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 4b6cb25..131adf7 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -83,7 +83,9 @@ sunxi_pinctrl_desc_find_function_by_name(struct sunxi_pinctrl *pctl, struct sunxi_desc_function *func = pin->functions; while (func->name) { - if (!strcmp(func->name, func_name)) + if (!strcmp(func->name, func_name) && + (!func->variant || + func->variant & pctl->variant)) return func; func++;
Pin function can not be match correctly when SUNXI_PIN describe with mutiple variant and same function. such as: on pinctrl-sun4i-a10.c SUNXI_PIN(SUNXI_PINCTRL_PIN(B, 2), SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), SUNXI_FUNCTION_VARIANT(0x2, "pwm", /* PWM0 */ PINCTRL_SUN4I_A10 | PINCTRL_SUN7I_A20), SUNXI_FUNCTION_VARIANT(0x3, "pwm", /* PWM0 */ PINCTRL_SUN8I_R40)), it would always match to the first variant function (PINCTRL_SUN4I_A10, PINCTRL_SUN7I_A20) so we should add variant compare on it. Regards Hao Signed-off-by: hao_zhang <hao5781286@gmail.com> --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)