-replace "baud" with "current-speed"
-if uart alias doesn't exist in DT, don't abort, pick 0
Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: devicetree-discuss@xxxxxxxxxxxxxxxx
Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
Cc: Rob Landley <rob@xxxxxxxxxxx>
Cc: linux-serial@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
.../devicetree/bindings/tty/serial/arc-uart.txt | 4 ++--
drivers/tty/serial/arc_uart.c | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/tty/serial/arc-uart.txt b/Documentation/devicetree/bindings/tty/serial/arc-uart.txt
index c3bd8f9..5cae2eb 100644
--- a/Documentation/devicetree/bindings/tty/serial/arc-uart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/arc-uart.txt
@@ -5,7 +5,7 @@ Required properties:
- reg : offset and length of the register set for the device.
- interrupts : device interrupt
- clock-frequency : the input clock frequency for the UART
-- baud : baud rate for UART
+- current-speed : baud rate for UART
e.g.
@@ -14,7 +14,7 @@ arcuart0: serial@c0fc1000 {
reg = <0xc0fc1000 0x100>;
interrupts = <5>;
clock-frequency = <80000000>;
- baud = <115200>;
+ current-speed = <115200>;
status = "okay";
};
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)
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
