From: Lucas Stach Date: Mon, 3 Nov 2014 22:16:54 +0000 (+0100) Subject: serial: of-serial: fetch line number from DT X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bd8324535ec1ff44aef55c0e40b9e7d56b310fb;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Greg Kroah-Hartman --- 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) {