| Message ID | 20181023160319.27003-1-jbrunet@baylibre.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: meson: fix pinconf bias disable | expand |
On 23/10/2018 18:03, Jerome Brunet wrote: > If a bias is enabled on a pin of an Amlogic SoC, calling .pin_config_set() > with PIN_CONFIG_BIAS_DISABLE will not disable the bias. Instead it will > force a pull-down bias on the pin. > > Instead of the pull type register bank, the driver should access the pull > enable register bank. > > Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- > drivers/pinctrl/meson/pinctrl-meson.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c > index 29a458da78db..4f3ab18636a3 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson.c > +++ b/drivers/pinctrl/meson/pinctrl-meson.c > @@ -192,7 +192,7 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, > dev_dbg(pc->dev, "pin %u: disable bias\n", pin); > > meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit); > - ret = regmap_update_bits(pc->reg_pull, reg, > + ret = regmap_update_bits(pc->reg_pullen, reg, > BIT(bit), 0); > if (ret) > return ret; > Acked-by: Neil Armstrong <narmstrong@baylibre.com> Nice catch ! Neil
On Tue, Oct 23, 2018 at 6:03 PM Jerome Brunet <jbrunet@baylibre.com> wrote: > If a bias is enabled on a pin of an Amlogic SoC, calling .pin_config_set() > with PIN_CONFIG_BIAS_DISABLE will not disable the bias. Instead it will > force a pull-down bias on the pin. > > Instead of the pull type register bank, the driver should access the pull > enable register bank. > > Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Patch applied for fixes with Neil's ACK. Yours, Linus Walleij
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 29a458da78db..4f3ab18636a3 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -192,7 +192,7 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, dev_dbg(pc->dev, "pin %u: disable bias\n", pin); meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit); - ret = regmap_update_bits(pc->reg_pull, reg, + ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0); if (ret) return ret;
If a bias is enabled on a pin of an Amlogic SoC, calling .pin_config_set() with PIN_CONFIG_BIAS_DISABLE will not disable the bias. Instead it will force a pull-down bias on the pin. Instead of the pull type register bank, the driver should access the pull enable register bank. Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)