From d84af195dbcd99ce172bf639538231141176d402 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Thu, 22 Jul 2010 13:01:11 -0600 Subject: [PATCH] of/device: Register children with a compatible value in of_platform_bus_probe() Currently, of_platform_bus_probe() completely skips nodes which do not explicitly match the 'matches' table passed in. Or, if the root node matches, then it registers all the children unconditionally. However, there are situations, such as registering devices from the root node, when it is desirable to register child nodes, but only if they actually represent devices. For example, the root node may contain both a local bus and a PCI device, but it also contains the chosen, aliases and cpus nodes which don't represent real devices. This patch changes of_platform_bus_probe() to register all nodes at the top level if they either match the matches table (the current behaviour), or if they have a 'compatible' value (indicating it represents a device). --- drivers/of/platform.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f3f1ec8..2ead562 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -709,16 +709,37 @@ int of_platform_bus_probe(struct device_node *root, rc = of_platform_bus_create(root, matches, &dev->dev); goto bail; } + + /* Register each child node if either: + * a) it has a 'compatible' value indicating they are a device, or + * b) it is specified by the 'matches' table (by name or device_type) + * If a node is specified in the matches table, then all its children + * also get registered. + */ for_each_child_of_node(root, child) { - if (!of_match_node(matches, child)) + void *compat = of_get_property(child, "compatible", NULL); + struct of_device_id *match = of_match_node(matches, child); + + /* Skip if node neither matches nor has a compatible property */ + if (!compat && !match) continue; - pr_debug(" match: %s\n", child->full_name); + pr_debug(" register device: %s\n", child->full_name); + + /* Passed the first test, register node as a platform device */ dev = of_platform_device_create(child, NULL, parent); - if (dev == NULL) + if (!dev) { rc = -ENOMEM; - else - rc = of_platform_bus_create(child, matches, &dev->dev); + of_node_put(child); + break; + } + + /* Only register child nodes if specified by matches table */ + if (!match) + continue; + + pr_debug(" register children of: %s\n", child->full_name); + rc = of_platform_bus_create(child, matches, &dev->dev); if (rc) { of_node_put(child); break; -- 1.7.0.4