diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-28 01:11:23 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-28 16:17:23 +0100 |
| commit | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (patch) | |
| tree | 58eab3431cdc5dd0a927c23b50e2447f15738bf8 /drivers/of | |
| parent | Merge branch 'devicetree/next-reserved-mem' into devicetree/next (diff) | |
| download | linux-676e1b2fcd9dbb47a59baac13d089621d22c68b8.tar.xz linux-676e1b2fcd9dbb47a59baac13d089621d22c68b8.zip | |
of: Add support for ePAPR "stdout-path" property
ePAPR 1.1 defines the "stdout-path" property for specifying the console
device, but Linux currently only handles the older "linux,stdout-path"
property. This patch adds parsing for the new property name.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 418a4ff9d97c..be2861d69b02 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1955,9 +1955,9 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) of_chosen = of_find_node_by_path("/chosen@0"); if (of_chosen) { - const char *name; - - name = of_get_property(of_chosen, "linux,stdout-path", NULL); + const char *name = of_get_property(of_chosen, "stdout-path", NULL); + if (!name) + name = of_get_property(of_chosen, "linux,stdout-path", NULL); if (name) of_stdout = of_find_node_by_path(name); } |