aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/stmpe.c7
-rw-r--r--include/linux/mfd/stmpe.h2
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index f9f7de796029..90c6151bc52e 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -953,13 +953,6 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
953 else 953 else
954 icr |= STMPE_ICR_LSB_HIGH; 954 icr |= STMPE_ICR_LSB_HIGH;
955 } 955 }
956
957 if (stmpe->pdata->irq_invert_polarity) {
958 if (id == STMPE801_ID)
959 icr ^= STMPE801_REG_SYS_CTRL_INT_HI;
960 else
961 icr ^= STMPE_ICR_LSB_HIGH;
962 }
963 } 956 }
964 957
965 if (stmpe->pdata->autosleep) { 958 if (stmpe->pdata->autosleep) {
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index 15dac790365f..383ac1512a39 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -190,7 +190,6 @@ struct stmpe_ts_platform_data {
190 * @id: device id to distinguish between multiple STMPEs on the same board 190 * @id: device id to distinguish between multiple STMPEs on the same board
191 * @blocks: bitmask of blocks to enable (use STMPE_BLOCK_*) 191 * @blocks: bitmask of blocks to enable (use STMPE_BLOCK_*)
192 * @irq_trigger: IRQ trigger to use for the interrupt to the host 192 * @irq_trigger: IRQ trigger to use for the interrupt to the host
193 * @irq_invert_polarity: IRQ line is connected with reversed polarity
194 * @autosleep: bool to enable/disable stmpe autosleep 193 * @autosleep: bool to enable/disable stmpe autosleep
195 * @autosleep_timeout: inactivity timeout in milliseconds for autosleep 194 * @autosleep_timeout: inactivity timeout in milliseconds for autosleep
196 * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or 195 * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or
@@ -207,7 +206,6 @@ struct stmpe_platform_data {
207 unsigned int blocks; 206 unsigned int blocks;
208 int irq_base; 207 int irq_base;
209 unsigned int irq_trigger; 208 unsigned int irq_trigger;
210 bool irq_invert_polarity;
211 bool autosleep; 209 bool autosleep;
212 bool irq_over_gpio; 210 bool irq_over_gpio;
213 int irq_gpio; 211 int irq_gpio;