Commit a6a55b52 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pinctrl-v5.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:
 "Two fixes for pin control, not much to say about it, it's just regular
  driver fixes:

   - Fix erroneous shift in the Meson driver

   - Make Lochnagar select the GPIOLIB Kconfig symbol"

* tag 'pinctrl-v5.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: meson: Fix wrong shift value when get drive-strength
  pinctrl: lochnagar: select GPIOLIB
parents b5b3159c 35c60be2
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config PINCTRL_LOCHNAGAR config PINCTRL_LOCHNAGAR
tristate "Cirrus Logic Lochnagar pinctrl driver" tristate "Cirrus Logic Lochnagar pinctrl driver"
depends on MFD_LOCHNAGAR depends on MFD_LOCHNAGAR
select GPIOLIB
select PINMUX select PINMUX
select PINCONF select PINCONF
select GENERIC_PINCONF select GENERIC_PINCONF
......
...@@ -441,6 +441,7 @@ static int meson_pinconf_get_drive_strength(struct meson_pinctrl *pc, ...@@ -441,6 +441,7 @@ static int meson_pinconf_get_drive_strength(struct meson_pinctrl *pc,
return ret; return ret;
meson_calc_reg_and_bit(bank, pin, REG_DS, &reg, &bit); meson_calc_reg_and_bit(bank, pin, REG_DS, &reg, &bit);
bit = bit << 1;
ret = regmap_read(pc->reg_ds, reg, &val); ret = regmap_read(pc->reg_ds, reg, &val);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment