summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorVineet Gupta <Vineet.Gupta1@synopsys.com>2013-02-11 14:11:41 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-13 08:37:49 -0800
commit11c62d4f1d8583dd6305824d704f33301da4e93a (patch)
treefd496077633ce328f65717554ca43e2b2c0b9f2d /drivers/tty/serial
parentf2eca58f2ad92ed20cc96b765a18525d5ace2d19 (diff)
serial/arc-uart: Miscll DT related updates (Grant's review comments)
-replace "baud" with "current-speed" -if uart alias doesn't exist in DT, don't abort, pick 0 Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Arnd Bergmann <arnd@arndb.de> Cc: devicetree-discuss@lists.ozlabs.org Cc: Rob Herring <rob.herring@calxeda.com> Cc: Rob Landley <rob@landley.net> Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-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 6f7eadc424a..d97e194b6bc 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)