mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] mfd: stmpe: Add devicetree probe support
@ 2013-06-06 14:20 Sascha Hauer
  0 siblings, 0 replies; only message in thread
From: Sascha Hauer @ 2013-06-06 14:20 UTC (permalink / raw)
  To: barebox

Our driver matches stmpe-i2c and stmpe-spi. It seems the device
we really support is the stmpe1601, so use this one for matching
the devicetree compatible.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mfd/stmpe-i2c.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index d87620e..d785430 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -106,6 +106,25 @@ static struct file_operations stmpe_fops = {
 	.write	= stmpe_write,
 };
 
+static struct stmpe_platform_data *stmpe_of_probe(struct device_d *dev)
+{
+	struct stmpe_platform_data *pdata;
+	struct device_node *node;
+
+	if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node)
+		return NULL;
+
+	pdata = xzalloc(sizeof(*pdata));
+
+	device_node_for_nach_child(dev->device_node, node) {
+		if (!strcmp(node->name, "stmpe_gpio")) {
+			pdata->blocks |= STMPE_BLOCK_GPIO;
+		}
+	}
+
+	return pdata;
+}
+
 static int stmpe_probe(struct device_d *dev)
 {
 	struct stmpe_platform_data *pdata = dev->platform_data;
@@ -113,8 +132,11 @@ static int stmpe_probe(struct device_d *dev)
 	struct stmpe_client_info *i2c_ci;
 
 	if (!pdata) {
-		dev_dbg(dev, "no platform data\n");
-		return -ENODEV;
+		pdata = stmpe_of_probe(dev);
+		if (!pdata) {
+			dev_dbg(dev, "no platform data\n");
+			return -ENODEV;
+		}
 	}
 
 	stmpe_dev = xzalloc(sizeof(struct stmpe));
@@ -140,9 +162,15 @@ static int stmpe_probe(struct device_d *dev)
 	return 0;
 }
 
+static struct platform_device_id stmpe_i2c_id[] = {
+	{ "stmpe1601", 0 },
+	{ }
+};
+
 static struct driver_d stmpe_driver = {
 	.name  = DRIVERNAME,
 	.probe = stmpe_probe,
+	.id_table = stmpe_i2c_id,
 };
 
 static int stmpe_init(void)
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-06-06 14:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-06 14:20 [PATCH] mfd: stmpe: Add devicetree probe support Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox