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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxx>
---
Changes since (implicit) v1, sent with Message-Id: 20170614113110.21604-2-u.kleine-koenig@xxxxxxxxxxxxxx:

 - fix typo
 - sort out constness issues

 drivers/of/base.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 592ebb015a73..a2d75d40bd67 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1999,6 +1999,8 @@ int of_device_is_stdout_path(struct device_d *dev)
 {
 	struct device_node *dn;
 	const char *name;
+	const char *p;
+	char *q;
 
 	if (!dev->device_node)
 		return 0;
@@ -2010,7 +2012,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 if it were available */
+	p = strchr(name, ':');
+	if (!p)
+		p = name + strlen(name);
+
+	q = xstrndup(name, p - name);
+
+	dn = of_find_node_by_path_or_alias(NULL, q);
+
+	free(q);
 
 	return dn == dev->device_node;
 }
-- 
2.11.0


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




[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux