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

[u-boot] / drivers / serial / ns16550.c

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 8d028de46afd8d802c061c35e35d356fb9a0f580..c6cb3eb500cae251509f3979a688469dedd4d3c4 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -54,8 +54,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define CONFIG_SYS_NS16550_IER  0x00
 #endif /* CONFIG_SYS_NS16550_IER */
 
-#ifdef CONFIG_DM_SERIAL
-
 static inline void serial_out_shift(void *addr, int shift, int value)
 {
 #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
@@ -90,18 +88,25 @@ static inline int serial_in_shift(void *addr, int shift)
 #endif
 }
 
+#ifdef CONFIG_DM_SERIAL
+
+#ifndef CONFIG_SYS_NS16550_CLK
+#define CONFIG_SYS_NS16550_CLK  0
+#endif
+
 static void ns16550_writeb(NS16550_t port, int offset, int value)
 {
        struct ns16550_platdata *plat = port->plat;
        unsigned char *addr;
 
        offset *= 1 << plat->reg_shift;
-       addr = map_physmem(plat->base, 0, MAP_NOCACHE) + offset;
+       addr = (unsigned char *)plat->base + offset;
+
        /*
         * As far as we know it doesn't make sense to support selection of
         * these options at run-time, so use the existing CONFIG options.
         */
-       serial_out_shift(addr, plat->reg_shift, value);
+       serial_out_shift(addr + plat->reg_offset, plat->reg_shift, value);
 }
 
 static int ns16550_readb(NS16550_t port, int offset)
@@ -110,9 +115,9 @@ static int ns16550_readb(NS16550_t port, int offset)
        unsigned char *addr;
 
        offset *= 1 << plat->reg_shift;
-       addr = map_physmem(plat->base, 0, MAP_NOCACHE) + offset;
+       addr = (unsigned char *)plat->base + offset;
 
-       return serial_in_shift(addr, plat->reg_shift);
+       return serial_in_shift(addr + plat->reg_offset, plat->reg_shift);
 }
 
 /* We can clean these up once everything is moved to driver model */
@@ -124,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);
@@ -267,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);
@@ -364,7 +355,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 
        /* try Processor Local Bus device first */
        addr = dev_get_addr(dev);
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
        if (addr == FDT_ADDR_T_NONE) {
                /* then try pci device */
                struct fdt_pci_addr pci_addr;
@@ -385,8 +376,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
                                return ret;
                }
 
-               ret = fdtdec_get_pci_bar32(gd->fdt_blob, dev->of_offset,
-                                          &pci_addr, &bar);
+               ret = fdtdec_get_pci_bar32(dev, &pci_addr, &bar);
                if (ret)
                        return ret;
 
@@ -397,9 +387,23 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
+#ifdef CONFIG_SYS_NS16550_PORT_MAPPED
        plat->base = addr;
+#else
+       plat->base = (unsigned long)map_physmem(addr, 0, MAP_NOCACHE);
+#endif
+
+       plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+                                    "reg-offset", 0);
        plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                        "reg-shift", 1);
+                                        "reg-shift", 0);
+       plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+                                    "clock-frequency",
+                                    CONFIG_SYS_NS16550_CLK);
+       if (!plat->clock) {
+               debug("ns16550 clock not defined\n");
+               return -EINVAL;
+       }
 
        return 0;
 }
@@ -411,4 +415,41 @@ const struct dm_serial_ops ns16550_serial_ops = {
        .getc = ns16550_serial_getc,
        .setbrg = ns16550_serial_setbrg,
 };
+
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+/*
+ * Please consider existing compatible strings before adding a new
+ * one to keep this table compact. Or you may add a generic "ns16550"
+ * compatible string to your dts.
+ */
+static const struct udevice_id ns16550_serial_ids[] = {
+       { .compatible = "ns16550" },
+       { .compatible = "ns16550a" },
+       { .compatible = "nvidia,tegra20-uart" },
+       { .compatible = "snps,dw-apb-uart" },
+       { .compatible = "ti,omap2-uart" },
+       { .compatible = "ti,omap3-uart" },
+       { .compatible = "ti,omap4-uart" },
+       { .compatible = "ti,am3352-uart" },
+       { .compatible = "ti,am4372-uart" },
+       { .compatible = "ti,dra742-uart" },
+       {}
+};
+#endif
+
+#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
+U_BOOT_DRIVER(ns16550_serial) = {
+       .name   = "ns16550_serial",
+       .id     = UCLASS_SERIAL,
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       .of_match = ns16550_serial_ids,
+       .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
+       .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+#endif
+       .priv_auto_alloc_size = sizeof(struct NS16550),
+       .probe = ns16550_serial_probe,
+       .ops    = &ns16550_serial_ops,
+       .flags  = DM_FLAG_PRE_RELOC,
+};
+#endif
 #endif /* CONFIG_DM_SERIAL */