diff options
| author | Tony Prisk <linux@prisktech.co.nz> | 2013-03-09 00:44:37 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-12 11:53:22 -0400 |
| commit | 5771a8051d5ebaac0651a957885f55b5f6221a02 (patch) | |
| tree | 65586bfb579da2acfa859b0c0212d44b372b0ba4 | |
| parent | 09081e5b47f6842669bb645e015deedf191244f4 (diff) | |
tty: serial: vt8500: Unneccessary duplicated clock code removed
Remove the extra code left over when the serial driver was changed
to require a clock. There is no fallback to 24Mhz as a clock is
now required.
Also remove a second call to of_clk_get which is unnecessary.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/vt8500_serial.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index a3f9dd5c9dff..705240e6c4ec 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c | |||
| @@ -611,14 +611,7 @@ static int vt8500_serial_probe(struct platform_device *pdev) | |||
| 611 | vt8500_port->uart.dev = &pdev->dev; | 611 | vt8500_port->uart.dev = &pdev->dev; |
| 612 | vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; | 612 | vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; |
| 613 | 613 | ||
| 614 | vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); | 614 | vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); |
| 615 | if (!IS_ERR(vt8500_port->clk)) { | ||
| 616 | vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); | ||
| 617 | } else { | ||
| 618 | /* use the default of 24Mhz if not specified and warn */ | ||
| 619 | pr_warn("%s: serial clock source not specified\n", __func__); | ||
| 620 | vt8500_port->uart.uartclk = 24000000; | ||
| 621 | } | ||
| 622 | 615 | ||
| 623 | snprintf(vt8500_port->name, sizeof(vt8500_port->name), | 616 | snprintf(vt8500_port->name, sizeof(vt8500_port->name), |
| 624 | "VT8500 UART%d", pdev->id); | 617 | "VT8500 UART%d", pdev->id); |
