From 1e1b743e218103f074a2fda5f420e93a1f40154d Mon Sep 17 00:00:00 2001 From: Gabriel Fernandez Date: Fri, 1 Mar 2013 13:07:26 +0100 Subject: [PATCH] --- yaml --- r: 373174 b: refs/heads/master c: 408a3fa867be13844af13bcbba25e70232fd99e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/stmpe.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4731915c739..52bfadf0956f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a200e320f7ba7daa42e5fae3a1c67ed2f704b05c +refs/heads/master: 408a3fa867be13844af13bcbba25e70232fd99e5 diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c index e550dcb1d394..bc8587777993 100644 --- a/trunk/drivers/mfd/stmpe.c +++ b/trunk/drivers/mfd/stmpe.c @@ -1015,7 +1015,10 @@ void stmpe_of_probe(struct stmpe_platform_data *pdata, struct device_node *np) { struct device_node *child; - pdata->id = -1; + pdata->id = of_alias_get_id(np, "stmpe-i2c"); + if (pdata->id < 0) + pdata->id = -1; + pdata->irq_trigger = IRQF_TRIGGER_NONE; of_property_read_u32(np, "st,autosleep-timeout",