diff options
| author | Songjun Wu | 2018-10-16 11:19:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-09 17:43:27 +0100 |
| commit | b871424f57076b33e7342d654b93951c6e8d8f29 (patch) | |
| tree | 6b08b6ab90068a703a2c882cc1bf670d9a1502f5 /drivers/tty/serial/lantiq.c | |
| parent | serial: sh-sci: Improve type-safety calling sci_receive_chars() (diff) | |
| download | kernel-qcow2-linux-b871424f57076b33e7342d654b93951c6e8d8f29.tar.gz kernel-qcow2-linux-b871424f57076b33e7342d654b93951c6e8d8f29.tar.xz kernel-qcow2-linux-b871424f57076b33e7342d654b93951c6e8d8f29.zip | |
serial: lantiq: Get serial id from dts
Get serial id from dts, also keep backward compatible when dts is not
updated.
Signed-off-by: Songjun Wu <songjun.wu@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/lantiq.c')
| -rw-r--r-- | drivers/tty/serial/lantiq.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c index 044128277248..66c671677761 100644 --- a/drivers/tty/serial/lantiq.c +++ b/drivers/tty/serial/lantiq.c @@ -688,7 +688,7 @@ lqasc_probe(struct platform_device *pdev) struct ltq_uart_port *ltq_port; struct uart_port *port; struct resource *mmres, irqres[3]; - int line = 0; + int line; int ret; mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -699,9 +699,20 @@ lqasc_probe(struct platform_device *pdev) return -ENODEV; } - /* check if this is the console port */ - if (mmres->start != CPHYSADDR(LTQ_EARLY_ASC)) - line = 1; + /* get serial id */ + line = of_alias_get_id(node, "serial"); + if (line < 0) { + if (IS_ENABLED(CONFIG_LANTIQ)) { + if (mmres->start == CPHYSADDR(LTQ_EARLY_ASC)) + line = 0; + else + line = 1; + } else { + dev_err(&pdev->dev, "failed to get alias id, errno %d\n", + line); + return line; + } + } if (lqasc_port[line]) { dev_err(&pdev->dev, "port %d already allocated\n", line); |