summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/of_serial.c
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2014-11-03 23:16:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-06 23:57:25 +0100
commit1bd8324535ec1ff44aef55c0e40b9e7d56b310fb (patch)
treed1d547d190757213db41dd9131e94de886bd74b1 /drivers/tty/serial/of_serial.c
parentserial: 8250_pci: Check mapping in pci_ni8430_init (diff)
downloadlinux-1bd8324535ec1ff44aef55c0e40b9e7d56b310fb.tar.xz
linux-1bd8324535ec1ff44aef55c0e40b9e7d56b310fb.zip
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/of_serial.c')
-rw-r--r--drivers/tty/serial/of_serial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 8749fb849803..7bc163421be4 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -102,6 +102,10 @@ 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 */
+ if ((ret = of_alias_get_id(np, "serial")) >= 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) {