Message ID | 1362139646-23613-1-git-send-email-linus.walleij@stericsson.com |
---|---|
State | Accepted |
Commit | 408a3fa867be13844af13bcbba25e70232fd99e5 |
Headers | show |
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index e550dcb..bc85877 100644 --- a/drivers/mfd/stmpe.c +++ b/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",