diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2013-02-11 09:41:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-13 17:37:49 +0100 |
| commit | 11c62d4f1d8583dd6305824d704f33301da4e93a (patch) | |
| tree | fd496077633ce328f65717554ca43e2b2c0b9f2d /drivers/tty/serial/arc_uart.c | |
| parent | drivers/serial: add GENERIC_HARDIRQS dependency (diff) | |
| download | linux-11c62d4f1d8583dd6305824d704f33301da4e93a.tar.xz linux-11c62d4f1d8583dd6305824d704f33301da4e93a.zip | |
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/arc_uart.c')
| -rw-r--r-- | drivers/tty/serial/arc_uart.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index 6f7eadc424a3..d97e194b6bc5 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) |