summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2014-12-05 20:21:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-03 15:52:13 -0800
commit3239fd31d4b6b7e0f5629eb458bd67b719050783 (patch)
tree98a47ffa6d4b15d8dcbe7fbe20a9ad41635fff4c
parentc3bda295eeb002ac708303350d5776c7fe01a127 (diff)
downloadop-kernel-dev-3239fd31d4b6b7e0f5629eb458bd67b719050783.zip
op-kernel-dev-3239fd31d4b6b7e0f5629eb458bd67b719050783.tar.gz
serial: of-serial: fetch line number from DT
The general agreed way to specify a fixed line number for a serial console is to provide a "serial" alias in the devicetree. Start parsing this property in of_serial. Signed-off-by: Lucas Stach <dev@lynxeye.de> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/of_serial.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index fbb719c..7ff61e2 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -102,6 +102,11 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
if (of_property_read_u32(np, "fifo-size", &prop) == 0)
port->fifosize = prop;
+ /* Check for a fixed line number */
+ ret = of_alias_get_id(np, "serial");
+ if (ret >= 0)
+ port->line = ret;
+
port->irq = irq_of_parse_and_map(np, 0);
port->iotype = UPIO_MEM;
if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
OpenPOWER on IntegriCloud