a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial/arc-uart: Miscll DT related updates (Grant's review comments)

Browse Source 
-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>
This commit is contained in:
Vineet Gupta 2013-02-11 14:11:41 +05:30 committed by Greg Kroah-Hartman
parent f2eca58f2a
commit 11c62d4f1d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/tty/serial/arc-uart.txt
View File

@ -5,7 +5,7 @@ Required properties:
- reg : offset and length of the register set for the device. - reg : offset and length of the register set for the device.
- interrupts : device interrupt - interrupts : device interrupt
- clock-frequency : the input clock frequency for the UART - clock-frequency : the input clock frequency for the UART
- baud : baud rate for UART - current-speed : baud rate for UART
e.g. e.g.
@ -14,7 +14,7 @@ arcuart0: serial@c0fc1000 {
reg = <0xc0fc1000 0x100>; reg = <0xc0fc1000 0x100>;
interrupts = <5>; interrupts = <5>;
clock-frequency = <80000000>; clock-frequency = <80000000>;
baud = <115200>; current-speed = <115200>;
status = "okay"; status = "okay";
}; };

10
drivers/tty/serial/arc_uart.c
View File

@ -547,8 +547,8 @@ arc_uart_init_one(struct platform_device *pdev, int dev_id)
} }
uart->port.uartclk = val; uart->port.uartclk = val;
if (of_property_read_u32(np, "baud", &val)) { if (of_property_read_u32(np, "current-speed", &val)) {
dev_err(&pdev->dev, "baud property NOT set\n"); dev_err(&pdev->dev, "current-speed property NOT set\n");
return -EINVAL; return -EINVAL;
} }
uart->baud = val; uart->baud = val;
@ -694,10 +694,8 @@ static int arc_serial_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
dev_id = of_alias_get_id(np, "serial"); dev_id = of_alias_get_id(np, "serial");
if (dev_id < 0) { if (dev_id < 0)
dev_err(&pdev->dev, "failed to get alias id: %d\n", dev_id); dev_id = 0;
return dev_id;
}
rc = arc_uart_init_one(pdev, dev_id); rc = arc_uart_init_one(pdev, dev_id);
if (rc) if (rc)