| Message ID | 20210717174836.14776-2-paul@crapouillou.net |
|---|---|
| State | Accepted |
| Commit | 7261851e938f4b0fe8c0f5a8e627ae90e1ba9875 |
| Headers | show |
| Series | [1/3] pinctrl: ingenic: Fix incorrect pull up/down info | expand |
Hi Paul, On 2021/7/18 上午1:48, Paul Cercueil wrote: > The ingenic_set_bias() function's "bias" argument is not a > "enum pin_config_param", so its value should not be compared against > values of that enum. > > This should fix the bias config not working on the X2000(E) SoCs. > > Fixes: 943e0da15370 ("pinctrl: Ingenic: Add pinctrl driver for X2000.") > Cc: <stable@vger.kernel.org> # v5.12 > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Tested-by: 周琰杰 (Zhou Yanjie)<zhouyanjie@wanyeetech.com> > diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c > index 126ca671c3cd..263498be8e31 100644 > --- a/drivers/pinctrl/pinctrl-ingenic.c > +++ b/drivers/pinctrl/pinctrl-ingenic.c > @@ -3441,17 +3441,17 @@ static void ingenic_set_bias(struct ingenic_pinctrl *jzpc, > { > if (jzpc->info->version >= ID_X2000) { > switch (bias) { > - case PIN_CONFIG_BIAS_PULL_UP: > + case GPIO_PULL_UP: > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false); > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, true); > break; > > - case PIN_CONFIG_BIAS_PULL_DOWN: > + case GPIO_PULL_DOWN: > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, false); > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, true); > break; > > - case PIN_CONFIG_BIAS_DISABLE: > + case GPIO_PULL_DIS: > default: > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, false); > ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false);
On Sat, Jul 17, 2021 at 7:48 PM Paul Cercueil <paul@crapouillou.net> wrote: > The ingenic_set_bias() function's "bias" argument is not a > "enum pin_config_param", so its value should not be compared against > values of that enum. > > This should fix the bias config not working on the X2000(E) SoCs. > > Fixes: 943e0da15370 ("pinctrl: Ingenic: Add pinctrl driver for X2000.") > Cc: <stable@vger.kernel.org> # v5.12 > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 126ca671c3cd..263498be8e31 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -3441,17 +3441,17 @@ static void ingenic_set_bias(struct ingenic_pinctrl *jzpc, { if (jzpc->info->version >= ID_X2000) { switch (bias) { - case PIN_CONFIG_BIAS_PULL_UP: + case GPIO_PULL_UP: ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false); ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, true); break; - case PIN_CONFIG_BIAS_PULL_DOWN: + case GPIO_PULL_DOWN: ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, false); ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, true); break; - case PIN_CONFIG_BIAS_DISABLE: + case GPIO_PULL_DIS: default: ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, false); ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false);
The ingenic_set_bias() function's "bias" argument is not a "enum pin_config_param", so its value should not be compared against values of that enum. This should fix the bias config not working on the X2000(E) SoCs. Fixes: 943e0da15370 ("pinctrl: Ingenic: Add pinctrl driver for X2000.") Cc: <stable@vger.kernel.org> # v5.12 Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)