serial: 8250_dw: get index of serial line from DT aliases

Get index of serial line from device tree using function of_alias_get_id().
If no alias is found, the 8250 core takes care of incrementing the line number.

Signed-off-by: Julien CHAUVEAU <julien.chauveau@neo-technologies.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 73a14ae8f0ae7ab3a13fd26432f1242157f8d2c9..18ff53298d2fba9b56c719bd1efd230febef0413 100644 (file)
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -258,6 +258,7 @@ static int dw8250_probe_of(struct uart_port *p,
        struct uart_8250_port *up = up_to_u8250p(p);
        u32                     val;
        bool has_ucv = true;
+       int id;
 
        if (of_device_is_compatible(np, "cavium,octeon-3860-uart")) {
 #ifdef __BIG_ENDIAN
@@ -301,6 +302,11 @@ static int dw8250_probe_of(struct uart_port *p,
        if (!of_property_read_u32(np, "reg-shift", &val))
                p->regshift = val;
 
+       /* get index of serial line, if found in DT aliases */
+       id = of_alias_get_id(np, "serial");
+       if (id >= 0)
+               p->line = id;
+
        /* clock got configured through clk api, all done */
        if (p->uartclk)
                return 0;