diff options
author | Rajendra Nayak <rnayak@ti.com> | 2011-12-14 06:55:44 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-16 17:10:55 -0500 |
commit | 8fe789dc375a1929bf64a9b982140cf394c8bce5 (patch) | |
tree | e64b153b1cc212d4eee2ec8ba221b8eb0c01c1ad /drivers/tty/serial/omap-serial.c | |
parent | ba77433da6e48062825169ae41d8efe7c183c3db (diff) |
omap-serial: Use default clock speed (48Mhz) if not specified
Use a default clock speed of 48Mhz, instead of ending up with 0,
if platforms fail to specify a valid clock speed.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 1baf24b96469..c5b545f19a16 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -43,6 +43,8 @@ | |||
43 | #include <plat/dmtimer.h> | 43 | #include <plat/dmtimer.h> |
44 | #include <plat/omap-serial.h> | 44 | #include <plat/omap-serial.h> |
45 | 45 | ||
46 | #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/ | ||
47 | |||
46 | static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS]; | 48 | static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS]; |
47 | 49 | ||
48 | /* Forward declaration of functions */ | 50 | /* Forward declaration of functions */ |
@@ -1387,6 +1389,11 @@ static int serial_omap_probe(struct platform_device *pdev) | |||
1387 | 1389 | ||
1388 | up->port.flags = omap_up_info->flags; | 1390 | up->port.flags = omap_up_info->flags; |
1389 | up->port.uartclk = omap_up_info->uartclk; | 1391 | up->port.uartclk = omap_up_info->uartclk; |
1392 | if (!up->port.uartclk) { | ||
1393 | up->port.uartclk = DEFAULT_CLK_SPEED; | ||
1394 | dev_warn(&pdev->dev, "No clock speed specified: using default:" | ||
1395 | "%d\n", DEFAULT_CLK_SPEED); | ||
1396 | } | ||
1390 | up->uart_dma.uart_base = mem->start; | 1397 | up->uart_dma.uart_base = mem->start; |
1391 | up->errata = omap_up_info->errata; | 1398 | up->errata = omap_up_info->errata; |
1392 | 1399 | ||