openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Songjun Wu 2018-10-16 17:19:04 +08:00 committed by Greg Kroah-Hartman
parent ed8c8e1ecc
commit b871424f57
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/tty/serial/lantiq.c
View File

@ -688,7 +688,7 @@ lqasc_probe(struct platform_device *pdev)
struct ltq_uart_port *ltq_port; struct ltq_uart_port *ltq_port;
struct uart_port *port; struct uart_port *port;
struct resource *mmres, irqres[3]; struct resource *mmres, irqres[3];
int line = 0; int line;
int ret; int ret;
mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -699,9 +699,20 @@ lqasc_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
/* check if this is the console port */ /* get serial id */
if (mmres->start != CPHYSADDR(LTQ_EARLY_ASC)) 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; line = 1;
} else {
dev_err(&pdev->dev, "failed to get alias id, errno %d\n",
line);
return line;
}
}
if (lqasc_port[line]) { if (lqasc_port[line]) {
dev_err(&pdev->dev, "port %d already allocated\n", line); dev_err(&pdev->dev, "port %d already allocated\n", line);