From: Leif Lindholm <leif.lindholm@linaro.org>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: mark.rutland@arm.com, grant.likely@linaro.org,
robh+dt@kernel.org, plagnioj@jcrosoft.com, ijc@debian.org,
andrew@lunn.ch, s.hauer@pengutronix.de
Subject: [PATCH v2 2/2] of: support passing console options with stdout-path
Date: Wed, 26 Nov 2014 17:40:40 +0000 [thread overview]
Message-ID: <1417023640-23464-3-git-send-email-leif.lindholm@linaro.org> (raw)
In-Reply-To: <1417023640-23464-1-git-send-email-leif.lindholm@linaro.org>
Support specifying console options (like with console=ttyXN,<options>)
by appending them to the stdout-path property after a separating ':'.
Example:
stdout-path = "uart0:115200";
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
drivers/of/base.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3e764bd..d265514 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -37,6 +37,7 @@ EXPORT_SYMBOL(of_allnodes);
struct device_node *of_chosen;
struct device_node *of_aliases;
struct device_node *of_stdout;
+static char *of_stdout_options;
struct kset *of_kset;
@@ -1844,7 +1845,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
if (IS_ENABLED(CONFIG_PPC) && !name)
name = of_get_property(of_aliases, "stdout", NULL);
if (name)
- of_stdout = of_find_node_by_path(name, NULL);
+ of_stdout = of_find_node_by_path(name, &of_stdout_options);
}
if (!of_aliases)
@@ -1970,7 +1971,7 @@ bool of_console_check(struct device_node *dn, char *name, int index)
{
if (!dn || dn != of_stdout || console_set_on_cmdline)
return false;
- return !add_preferred_console(name, index, NULL);
+ return !add_preferred_console(name, index, of_stdout_options);
}
EXPORT_SYMBOL_GPL(of_console_check);
--
1.7.10.4
next prev parent reply other threads:[~2014-11-26 17:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 17:40 [PATCH v2 0/2] of: support passing console options with stdout-path Leif Lindholm
2014-11-26 17:40 ` [PATCH v2 1/2] of: add optional options parameter to of_find_node_by_path() Leif Lindholm
2014-11-26 21:06 ` Grant Likely
2014-11-26 22:19 ` Leif Lindholm
2014-11-26 17:40 ` Leif Lindholm [this message]
2014-11-26 18:30 ` [PATCH v2 2/2] of: support passing console options with stdout-path Andrew Lunn
2014-11-26 21:07 ` Grant Likely
2014-11-26 21:48 ` Andrew Lunn
2014-11-27 12:15 ` Mark Rutland
2014-11-27 13:16 ` Leif Lindholm
2014-11-27 13:41 ` Mark Rutland
2014-11-27 13:45 ` Grant Likely
2014-11-27 13:39 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417023640-23464-3-git-send-email-leif.lindholm@linaro.org \
--to=leif.lindholm@linaro.org \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=ijc@debian.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=plagnioj@jcrosoft.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).