system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-09 21:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pin control fixes for the v5.5 kernel cycle:

Browse source 
- Fix erroneous shift in the Meson driver
 
 - Make Lochnagar select the GPIOLIB Kconfig symbol
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAl4Xn0cACgkQQRCzN7AZ
 XXNaGxAAq0eXTVJmO7Q3fuP/68xPDZz/wHjMmQOaAkKS7elltAS1DHGFsQuzqRzF
 YGEPC1OFJ1J0aWnlpN7xTeKEZloZl6f5CV9RiD1T6so+gz2Dx0sCmQbSdebKtO9H
 0ycKpwnZvKe7V1MpeK8d/4iMcNvOW2l9OsdQl9GfOYEp/HdGjZsIpY1lfzfRKqmC
 tQyjmtcNe+xWlkA2Bktx3PzDam+qh03aAUyJA+xEDGJY+JrNvK3OPEdU76fN9b14
 QLM9bCgIA16CsbRhkyGr9skuaPU10PHYYcEj3/uzn51yKCEnM7wLtoXVkJpSuNfM
 +5n9Hee53Bcn25UOKGSTyq5ZT9Gi7l4ISIm4MbbLOSPIlKP91ISExN7Um9+cMxS1
 dSyKhHrKqxao6WDf8eKIa1txNOu8/HhU5V1562sMDQwjNk+LdDEhXB+QEUcAjeOW
 MmvRb3/2PZMVVvf7wV7asnVxw/iOtuqfJfA4gHi+yUZ1rrLgNiXJqtvCa7FUT9UP
 BaF9VY84U6xsymQTxMiur9kMn7RyXNcQk6oKLoFo2jC9bafK2qIf7dGgJdEifrr8
 F06vSqiMmDxYzXPDB4RLC0zbhwGTwSvDiLACBUeb2PvkMvGyeZ0cVIaAsuSDHxaC
 D5J2/dz46loW97oMq9HF+5cReXbZlvDNj6klOC97KHioLlAdJtA=
 =OF8o
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-01-09 15:41:54 -08:00
parent b5b3159cff 35c60be220
commit a6a55b52a1
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/pinctrl/cirrus/Kconfig
View file

@ -2,6 +2,7 @@
config PINCTRL_LOCHNAGAR
tristate "Cirrus Logic Lochnagar pinctrl driver"
depends on MFD_LOCHNAGAR
select GPIOLIB
select PINMUX
select PINCONF
select GENERIC_PINCONF

1
drivers/pinctrl/meson/pinctrl-meson.c
View file

@ -441,6 +441,7 @@ static int meson_pinconf_get_drive_strength(struct meson_pinctrl *pc,
return ret;
meson_calc_reg_and_bit(bank, pin, REG_DS, &reg, &bit);
bit = bit << 1;
ret = regmap_read(pc->reg_ds, reg, &val);
if (ret)