]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
serial: of-serial: fetch line number from DT
authorLucas Stach <dev@lynxeye.de>
Fri, 5 Dec 2014 19:21:57 +0000 (20:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Feb 2015 23:52:13 +0000 (15:52 -0800)
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>
drivers/tty/serial/of_serial.c

index fbb719c89a6114d801cfbf62922def461a7a6a47..7ff61e24a195cbca54d60aaefd65bbdf3d0af187 100644 (file)
@@ -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) {