Merge branch 'master' of git://git.denx.de/u-boot-tegra

[karo-tx-uboot.git] / drivers / serial / serial_ns16550.c

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 4413e6911872b38c403baca8c8662205b2b9eef0..dafeed742df49e7d56bf2774314ea535c228be22 100644 (file)
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -122,15 +122,6 @@ static int calc_divisor (NS16550_t port)
 {
        const unsigned int mode_x_div = 16;
 
-#ifdef CONFIG_OMAP1510
-       /* If can't cleanly clock 115200 set div to 1 */
-       if ((CONFIG_SYS_NS16550_CLK == 12000000) && (gd->baudrate == 115200)) {
-               port->osc_12m_sel = OSC_12M_SEL;        /* enable 6.5 * divisor */
-               return (1);                             /* return 1 for base divisor */
-       }
-       port->osc_12m_sel = 0;                  /* clear if previsouly set */
-#endif
-
        return DIV_ROUND_CLOSEST(CONFIG_SYS_NS16550_CLK,
                                                mode_x_div * gd->baudrate);
 }