[PATCH 2/2] mfd: stmpe: DT: Add stmpe-i2c dt alias to get id device

Linus Walleij linus.walleij at stericsson.com
Fri Mar 1 23:07:26 EST 2013


From: Gabriel Fernandez <gabriel.fernandez at stericsson.com>

This patch augments the STMP driver to read the device id
from the stmpe-i2c dt alias if present.

Cc: devicetree-discuss at lists.ozlabs.org
Signed-off-by: Gabriel Fernandez <gabriel.fernandez at stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
---
 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



More information about the devicetree-discuss mailing list