From: Julien CHAUVEAU Date: Tue, 4 Nov 2014 10:45:55 +0000 (+0100) Subject: serial: 8250_dw: get index of serial line from DT aliases X-Git-Tag: v5.15~16682^2~79 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f77d55a3b56a98d14b6e7dc549c24b33011d175d;p=platform%2Fkernel%2Flinux-starfive.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 73a14ae..18ff532 100644 --- 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;