diff options
| author |   Patrice Chotard <patrice.chotard@st.com> | 2016-08-10 09:39:07 +0200 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2016-08-10 09:23:33 +0100 |
| commit | c4dd1ba355aae2bc3d1213da6c66c53e3c31e028 (patch) | |
| tree | 5d6175b5371a9010f5736c5c5ed84f95548f60cc /drivers/mfd/stmpe.h | |
| parent | mfd: stmpe: Add STMPE_IDX_SYS_CTRL/2 enum (diff) | |
| download | linux-dev-c4dd1ba355aae2bc3d1213da6c66c53e3c31e028.tar.xz linux-dev-c4dd1ba355aae2bc3d1213da6c66c53e3c31e028.zip | |
mfd: stmpe: Add reset support for all STMPE variant
Reset was only implemented for STMPE1801 variant despite
all variant have a SOFT_RESET bit.
For STMPE2401/2403/801/1601/1801 SOFT_RESET bit is bit 7
of SYS_CTRL register.
For STMPE610/811 (which have the same variant id) SOFT_RESET
bit is bit 1 of SYS_CTRL register.
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/stmpe.h')
| -rw-r--r-- | drivers/mfd/stmpe.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h index 406f9f2d8935..4ae343de71eb 100644 --- a/drivers/mfd/stmpe.h +++ b/drivers/mfd/stmpe.h @@ -104,6 +104,8 @@ int stmpe_remove(struct stmpe *stmpe); #define STMPE_ICR_LSB_EDGE (1 << 1) #define STMPE_ICR_LSB_GIM (1 << 0) +#define STMPE_SYS_CTRL_RESET (1 << 7) + /* * STMPE801 */ @@ -126,6 +128,7 @@ int stmpe_remove(struct stmpe *stmpe); /* * STMPE811 */ +#define STMPE811_ID 0x0811 #define STMPE811_IRQ_TOUCH_DET 0 #define STMPE811_IRQ_FIFO_TH 1 @@ -155,6 +158,8 @@ int stmpe_remove(struct stmpe *stmpe); #define STMPE811_REG_GPIO_FE 0x16 #define STMPE811_REG_GPIO_AF 0x17 +#define STMPE811_SYS_CTRL_RESET (1 << 1) + #define STMPE811_SYS_CTRL2_ADC_OFF (1 << 0) #define STMPE811_SYS_CTRL2_TSC_OFF (1 << 1) #define STMPE811_SYS_CTRL2_GPIO_OFF (1 << 2) @@ -244,8 +249,6 @@ int stmpe_remove(struct stmpe *stmpe); #define STMPE1801_REG_GPIO_PULL_UP_MID 0x23 #define STMPE1801_REG_GPIO_PULL_UP_HIGH 0x24 -#define STMPE1801_MSK_SYS_CTRL_RESET (1 << 7) - #define STMPE1801_MSK_INT_EN_KPC (1 << 1) #define STMPE1801_MSK_INT_EN_GPIO (1 << 3) |