[RESEND PATCH 6/7] mfd: cros_ec: Instantiate sub-devices from device tree
From: Javier Martinez Canillas <hidden>
Date: 2014-08-20 12:13:31
Also in:
linux-input, linux-samsung-soc
Subsystem:
multifunction devices (mfd), the rest · Maintainers:
Lee Jones, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2014-08-22 · Re: [RESEND PATCH 6/7] mfd: cros_ec: Instantiate sub-devices from device tree · Javier Martinez Canillas <hidden>
- 2014-08-21 · Re: [RESEND PATCH 6/7] mfd: cros_ec: Instantiate sub-devices from device tree · Lee Jones <hidden>
From: Todd Broch <redacted> If the EC device tree node has sub-nodes, try to instantiate them as MFD sub-devices. We can configure the EC features provided by the board. Signed-off-by: Todd Broch <redacted> Signed-off-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org> --- drivers/mfd/cros_ec.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index 634c434..96c926c 100644
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c@@ -21,6 +21,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/mfd/core.h> +#include <linux/of_platform.h> #include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec_commands.h> #include <linux/delay.h>
@@ -109,22 +110,16 @@ int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, EXPORT_SYMBOL(cros_ec_cmd_xfer); static const struct mfd_cell cros_devs[] = { - { - .name = "cros-ec-keyb", - .id = 1, - .of_compatible = "google,cros-ec-keyb", - }, - { - .name = "cros-ec-i2c-tunnel", - .id = 2, - .of_compatible = "google,cros-ec-i2c-tunnel", - }, }; int cros_ec_register(struct cros_ec_device *ec_dev) { struct device *dev = ec_dev->dev; int err = 0; +#ifdef CONFIG_OF + struct device_node *node; + int id = ARRAY_SIZE(cros_devs); +#endif if (ec_dev->din_size) { ec_dev->din = devm_kzalloc(dev, ec_dev->din_size, GFP_KERNEL);
@@ -146,6 +141,31 @@ int cros_ec_register(struct cros_ec_device *ec_dev) dev_err(dev, "failed to add mfd devices\n"); return err; } +#ifdef CONFIG_OF + /* + * Add sub-devices declared in the device tree. NOTE they should NOT be + * declared in cros_devs + */ + for_each_child_of_node(dev->of_node, node) { + char name[128]; + struct mfd_cell cell = { + .id = 0, + .name = name, + }; + + if (of_modalias_node(node, name, sizeof(name)) < 0) { + dev_err(dev, "modalias failure on %s\n", + node->full_name); + continue; + } + dev_dbg(dev, "adding MFD sub-device %s\n", node->name); + cell.of_compatible = of_get_property(node, "compatible", NULL); + err = mfd_add_devices(dev, ++id, &cell, 1, NULL, ec_dev->irq, + NULL); + if (err) + dev_err(dev, "fail to add %s\n", node->full_name); + } +#endif dev_info(dev, "Chrome EC device registered\n");
--
2.0.1