Commit b871424f authored by Songjun Wu's avatar Songjun Wu Committed by Greg Kroah-Hartman

serial: lantiq: Get serial id from dts

Get serial id from dts, also keep backward compatible when dts is not
updated.
Signed-off-by: default avatarSongjun Wu <songjun.wu@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed8c8e1e
...@@ -688,7 +688,7 @@ lqasc_probe(struct platform_device *pdev) ...@@ -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) ...@@ -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");
line = 1; 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]) { if (lqasc_port[line]) {
dev_err(&pdev->dev, "port %d already allocated\n", line); dev_err(&pdev->dev, "port %d already allocated\n", line);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment