summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/arc_uart.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index 6f7eadc..d97e194 100644
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -547,8 +547,8 @@ arc_uart_init_one(struct platform_device *pdev, int dev_id)
}
uart->port.uartclk = val;
- if (of_property_read_u32(np, "baud", &val)) {
- dev_err(&pdev->dev, "baud property NOT set\n");
+ if (of_property_read_u32(np, "current-speed", &val)) {
+ dev_err(&pdev->dev, "current-speed property NOT set\n");
return -EINVAL;
}
uart->baud = val;
@@ -694,10 +694,8 @@ static int arc_serial_probe(struct platform_device *pdev)
return -ENODEV;
dev_id = of_alias_get_id(np, "serial");
- if (dev_id < 0) {
- dev_err(&pdev->dev, "failed to get alias id: %d\n", dev_id);
- return dev_id;
- }
+ if (dev_id < 0)
+ dev_id = 0;
rc = arc_uart_init_one(pdev, dev_id);
if (rc)