From 1ebf5ff0c18a44c968533bc47d9f26215ffb779d Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Mon, 6 Jan 2014 13:45:43 +0100 Subject: [PATCH] of: find also nodes by mixture of alias and path Let of_find_node_by_path_or_alias also find a node starting with an alias followed by a path like "i2c0/tps@24" Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer --- drivers/of/base.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index ea2d879be..6e5e7d6e7 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1378,11 +1378,32 @@ EXPORT_SYMBOL(of_find_node_by_path); struct device_node *of_find_node_by_path_or_alias(struct device_node *root, const char *str) { + struct device_node *node; + const char *slash; + char *alias; + size_t len = 0; + if (*str == '/') return of_find_node_by_path_from(root, str); - else + + slash = strchr(str, '/'); + + if (!slash) return of_find_node_by_alias(root, str); + len = slash - str + 1; + alias = xmalloc(len); + strlcpy(alias, str, len); + + node = of_find_node_by_alias(root, alias); + + if (!node) + goto out; + + node = of_find_node_by_path_from(node, slash); +out: + free(alias); + return node; } EXPORT_SYMBOL(of_find_node_by_path_or_alias);