blob: 674294d4151c761de384f34ff850daa0fced8e49 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Wed, 14 Jun 2017 13:30:54 +0200
Subject: [PATCH] of_device_is_stdout_path: split off options and support
aliases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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@pengutronix.de>
Forwarded: id:20170614180249.12644-1-u.kleine-koenig@pengutronix.de (v2)
---
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 94e4c6b7b4f8..a1ae8073931d 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2015,6 +2015,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;
@@ -2026,7 +2028,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;
}
|
