summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Rosin <peda@axentia.se>2016-12-02 11:51:14 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-12-07 15:27:02 +0100
commit6c4ef627d8c458fe8880ccd2e2cd581de0d9b42f (patch)
treef3f5e3e3302205c38aac6874fb1e2603e05ab8e7
parentpinctrl: mt8173: set GPIO16 to usb iddig mode (diff)
downloadlinux-6c4ef627d8c458fe8880ccd2e2cd581de0d9b42f.tar.xz
linux-6c4ef627d8c458fe8880ccd2e2cd581de0d9b42f.zip
pinctrl: sx150x: access the correct bits in the 4-bit regs of sx150[147]
The code assumes 8-bit or 16-bit width registers, but three of the chips (sx1501/sx1504/sx1507) are 4-bit. So, try to handle 4-bit chips as well, they leave the high part of each register unused. Signed-off-by: Peter Rosin <peda@axentia.se> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-sx150x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index 1a1c8b51a992..a121819ffc92 100644
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -5,6 +5,7 @@
* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
*
* Driver for Semtech SX150X I2C GPIO Expanders
+ * The handling of the 4-bit chips (SX1501/SX1504/SX1507) is untested.
*
* Author: Gregory Bean <gbean@codeaurora.org>
*
@@ -1088,7 +1089,7 @@ static int sx150x_regmap_reg_write(void *context, unsigned int reg,
val = sx150x_maybe_swizzle(pctl, reg, val);
- n = width - 8;
+ n = (width - 1) & ~7;
do {
const u8 byte = (val >> n) & 0xff;