From: Gabriel Fernandez <[email protected]>
This patch augments the STMP driver to read the device id
from the stmpe-i2c dt alias if present.
Cc: [email protected]
Signed-off-by: Gabriel Fernandez <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
---
drivers/mfd/stmpe.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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",
--
1.7.11.3
On Fri, Mar 1, 2013 at 1:07 PM, Linus Walleij
<[email protected]> wrote:
> From: Gabriel Fernandez <[email protected]>
>
> This patch augments the STMP driver to read the device id
> from the stmpe-i2c dt alias if present.
>
> Cc: [email protected]
> Signed-off-by: Gabriel Fernandez <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
Hi Sam,
ping on this!
Yours,
Linus Walleij
Hi Linus,
On Fri, Mar 01, 2013 at 01:07:26PM +0100, Linus Walleij wrote:
> From: Gabriel Fernandez <[email protected]>
>
> This patch augments the STMP driver to read the device id
> from the stmpe-i2c dt alias if present.
>
> Cc: [email protected]
> Signed-off-by: Gabriel Fernandez <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> drivers/mfd/stmpe.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Applied to mfd-next as well.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/