[PATCH 2/2] of_device_is_stdout_path: split off options and support aliases

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Wed Jun 14 04:31:10 PDT 2017


Several device trees use something like:

	stdout-path = "serial0:115200n8";

Currently of_device_is_stdout_path fails to do the right thing here
because it expects an absolute node path and no options. So split off
options (everything after the colon) and resolve aliases.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 drivers/of/base.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 592ebb015a73..e401c11a878f 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1999,6 +1999,7 @@ int of_device_is_stdout_path(struct device_d *dev)
 {
 	struct device_node *dn;
 	const char *name;
+	char *q;
 
 	if (!dev->device_node)
 		return 0;
@@ -2010,7 +2011,16 @@ int of_device_is_stdout_path(struct device_d *dev)
 	if (!name)
 		return 0;
 
-	dn = of_find_node_by_path(name);
+	/* This could make use of strchrnul it it were available */
+	q = strchr(name, ':');
+	if (!q)
+		q = name + strlen(name);
+
+	q = xstrndup(name, q - name);
+
+	dn = of_find_node_by_path_or_alias(NULL, q);
+
+	free(q);
 
 	return dn == dev->device_node;
 }
-- 
2.11.0




More information about the barebox mailing list