summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-05 12:40:45 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-12 18:23:53 (GMT)
commitf7d2c0bbdb7b784cc035cacb7d36b379ba1c3bef (patch)
treebdf5653a6afb86d0d516d319f458b7e89085f785
parent5c19e95216b93b0d29c6a4887e69a980edc6fc81 (diff)
downloadlinux-f7d2c0bbdb7b784cc035cacb7d36b379ba1c3bef.tar.xz
serial: i.MX: evaluate linux,stdout-path property
devicetrees may have the linux,stdout-path property to specify the console. This patch adds support to the i.MX serial driver for this. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/imx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a5f32c7..2c13155 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1912,6 +1912,9 @@ static int serial_imx_probe_dt(struct imx_port *sport,
sport->devdata = of_id->data;
+ if (of_device_is_stdout_path(np))
+ add_preferred_console(imx_reg.cons->name, sport->port.line, 0);
+
return 0;
}
#else