summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-10-04 16:02:27 +0200
committerJiri Slaby <jslaby@suse.cz>2015-01-09 11:28:27 +0100
commit83ee596143c7f78fec7c8f36f92be2223d9a8bad (patch)
tree6c764892a50c6426d5ed7b7a938883d9971bc6ad
parentbc5e18c1dc407bd245a190076d362ecf7975e64a (diff)
downloadlinux-stable-83ee596143c7f78fec7c8f36f92be2223d9a8bad.tar.gz
linux-stable-83ee596143c7f78fec7c8f36f92be2223d9a8bad.tar.bz2
linux-stable-83ee596143c7f78fec7c8f36f92be2223d9a8bad.zip
mfd: stmpe: Fix STMPE24xx GPMR LSB
commit 871c3cf4ea7d5baf58e0a40bce7431ca5525aa2a upstream. The least significat byte of the GPIO value read register on the STMPE24xx series is on addres 0xA4 not 0xA5. Correct against datasheet and tested on the STMPE2401 hardware. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/mfd/stmpe.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h
index ff2b09ba8797..50a5c8697bf7 100644
--- a/drivers/mfd/stmpe.h
+++ b/drivers/mfd/stmpe.h
@@ -269,7 +269,7 @@ int stmpe_remove(struct stmpe *stmpe);
#define STMPE24XX_REG_CHIP_ID 0x80
#define STMPE24XX_REG_IEGPIOR_LSB 0x18
#define STMPE24XX_REG_ISGPIOR_MSB 0x19
-#define STMPE24XX_REG_GPMR_LSB 0xA5
+#define STMPE24XX_REG_GPMR_LSB 0xA4
#define STMPE24XX_REG_GPSR_LSB 0x85
#define STMPE24XX_REG_GPCR_LSB 0x88
#define STMPE24XX_REG_GPDR_LSB 0x8B