From 1194ccc421c95c685578976175dc60c11c918c7f Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Thu, 29 Nov 2012 00:17:15 +0530 Subject: [PATCH] --- yaml --- r: 345045 b: refs/heads/master c: 12a5105e04143569b3e9e5ef03cf9cad8862473a h: refs/heads/master i: 345043: 2a4390cda61a54f838ef8147a7f2b8ba8c8b37d6 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/stmpe.c | 7 ------- trunk/include/linux/mfd/stmpe.h | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 53ab3228c6b8..0811ba382f3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e1328be4d4e4967d54bf7ae3b0805ec53fc4f91 +refs/heads/master: 12a5105e04143569b3e9e5ef03cf9cad8862473a diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c index f9f7de796029..90c6151bc52e 100644 --- a/trunk/drivers/mfd/stmpe.c +++ b/trunk/drivers/mfd/stmpe.c @@ -953,13 +953,6 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe) else icr |= STMPE_ICR_LSB_HIGH; } - - if (stmpe->pdata->irq_invert_polarity) { - if (id == STMPE801_ID) - icr ^= STMPE801_REG_SYS_CTRL_INT_HI; - else - icr ^= STMPE_ICR_LSB_HIGH; - } } if (stmpe->pdata->autosleep) { diff --git a/trunk/include/linux/mfd/stmpe.h b/trunk/include/linux/mfd/stmpe.h index 15dac790365f..383ac1512a39 100644 --- a/trunk/include/linux/mfd/stmpe.h +++ b/trunk/include/linux/mfd/stmpe.h @@ -190,7 +190,6 @@ struct stmpe_ts_platform_data { * @id: device id to distinguish between multiple STMPEs on the same board * @blocks: bitmask of blocks to enable (use STMPE_BLOCK_*) * @irq_trigger: IRQ trigger to use for the interrupt to the host - * @irq_invert_polarity: IRQ line is connected with reversed polarity * @autosleep: bool to enable/disable stmpe autosleep * @autosleep_timeout: inactivity timeout in milliseconds for autosleep * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or @@ -207,7 +206,6 @@ struct stmpe_platform_data { unsigned int blocks; int irq_base; unsigned int irq_trigger; - bool irq_invert_polarity; bool autosleep; bool irq_over_gpio; int irq_gpio;