diff options
author | Tony Lindgren <tony@atomide.com> | 2020-06-16 18:25:03 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2020-06-16 18:25:03 +0200 |
commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
tree | d98c1adacc8c65b475c325b427e54b8205b0013d /drivers/pinctrl/pinctrl-sx150x.c | |
parent | Revert "bus: ti-sysc: Increase max softreset wait" (diff) | |
parent | Linux 5.8-rc1 (diff) | |
download | linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.xz linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.zip |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
Diffstat (limited to 'drivers/pinctrl/pinctrl-sx150x.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-sx150x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c index 6e74bd87d959..708bc91862fe 100644 --- a/drivers/pinctrl/pinctrl-sx150x.c +++ b/drivers/pinctrl/pinctrl-sx150x.c @@ -988,7 +988,7 @@ static unsigned int sx150x_maybe_swizzle(struct sx150x_pinctrl *pctl, /* * In order to mask the differences between 16 and 8 bit expander * devices we set up a sligthly ficticious regmap that pretends to be - * a set of 32-bit (to accomodate RegSenseLow/RegSenseHigh + * a set of 32-bit (to accommodate RegSenseLow/RegSenseHigh * pair/quartet) registers and transparently reconstructs those * registers via multiple I2C/SMBus reads * |