diff options
| author |   Lubomir Rintel <lkundrak@v3.sk> | 2019-02-24 12:58:02 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-26 12:30:44 +0100 |
| commit | fe9ed6d2483fda55465f32924fb15bce0fac3fac (patch) | |
| tree | 0aacb3da4934ff291d21b5ed768413e5c0fb9f57 /drivers/tty | |
| parent | tty: hvc_xen: Mark expected switch fall-through (diff) | |
| download | wireguard-linux-fe9ed6d2483fda55465f32924fb15bce0fac3fac.tar.xz wireguard-linux-fe9ed6d2483fda55465f32924fb15bce0fac3fac.zip | |
serial: 8250_pxa: honor the port number from devicetree
Like the other OF-enabled drivers, use the port number from the firmware if
the devicetree specifies an alias:
aliases {
...
serial2 = &uart2; /* Should be ttyS2 */
}
This is how the deprecated pxa.c driver behaved, switching to 8250_pxa
messes up the numbering.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_pxa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c index b9bcbe20a2be..c47188860e32 100644 --- a/drivers/tty/serial/8250/8250_pxa.c +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -113,6 +113,10 @@ static int serial_pxa_probe(struct platform_device *pdev) if (ret) return ret; + ret = of_alias_get_id(pdev->dev.of_node, "serial"); + if (ret >= 0) + uart.port.line = ret; + uart.port.type = PORT_XSCALE; uart.port.iotype = UPIO_MEM32; uart.port.mapbase = mmres->start; |