]> git.sur5r.net Git - u-boot/commitdiff
serial: 16550: Drop OMAP1510 support
authorMarek Vasut <marex@denx.de>
Wed, 25 May 2016 00:13:16 +0000 (02:13 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 3 Jun 2016 01:21:41 +0000 (21:21 -0400)
The CONFIG_OMAP1510 is no longer defined, so remove this dead code.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Nishanth Menon <nm@ti.com>
drivers/serial/ns16550.c

index 4763a1c836b6f66a0386174b35989e4d23d7f660..c6cb3eb500cae251509f3979a688469dedd4d3c4 100644 (file)
@@ -129,27 +129,13 @@ static int ns16550_readb(NS16550_t port, int offset)
                (unsigned char *)addr - (unsigned char *)com_port)
 #endif
 
-static inline int calc_divisor(NS16550_t port, int clock, int baudrate)
+int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate)
 {
        const unsigned int mode_x_div = 16;
 
        return DIV_ROUND_CLOSEST(clock, mode_x_div * baudrate);
 }
 
-int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate)
-{
-#ifdef CONFIG_OMAP1510
-       /* If can't cleanly clock 115200 set div to 1 */
-       if ((clock == 12000000) && (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 calc_divisor(port, clock, baudrate);
-}
-
 static void NS16550_setbrg(NS16550_t com_port, int baud_divisor)
 {
        serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr);
@@ -272,8 +258,8 @@ static inline void _debug_uart_init(void)
         * feasible. The better fix is to move all users of this driver to
         * driver model.
         */
-       baud_divisor = calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
-                                   CONFIG_BAUDRATE);
+       baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
+                                           CONFIG_BAUDRATE);
        serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER);
        serial_dout(&com_port->mcr, UART_MCRVAL);
        serial_dout(&com_port->fcr, UART_FCRVAL);