summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAnatoly Palto <a.palto@sam-solutions.net>2013-03-04 17:08:35 +0300
committerJustin Waters <justin.waters@timesys.com>2013-11-07 12:19:25 -0500
commitfdd22c8b7560c25264dfb8d5c17a4447846749e8 (patch)
treeb190affd31466ef7f80e8c514bb8c4294c66e360 /drivers
parentd22749a6977b31ec1dd82c62a1cb49766e9c0c2c (diff)
Added support working two touch screens simultaneously
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/stmpe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 7ab7746631d4..2a0b8613833f 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -915,14 +915,14 @@ static int __devinit stmpe_probe(struct i2c_client *i2c,
stmpe->dev = &i2c->dev;
stmpe->i2c = i2c;
- stmpe->pdata = pdata;
- stmpe->irq_base = pdata->irq_base;
-
stmpe->partnum = id->driver_data;
stmpe->variant = stmpe_variant_info[stmpe->partnum];
stmpe->regs = stmpe->variant->regs;
stmpe->num_gpios = stmpe->variant->num_gpios;
+ stmpe->pdata = pdata;
+ stmpe->irq_base = pdata->irq_base + pdata->id * stmpe->variant->num_irqs;
+
i2c_set_clientdata(i2c, stmpe);
ret = stmpe_chip_init(stmpe);