Merge git://git.denx.de/u-boot-x86

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

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 8f051914f54a37539d5768dd9d8ed90ff34adcf0..70c946249f0b729277e210509c1d622904ccec40 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -132,11 +132,12 @@ static void NS16550_setbrg(NS16550_t com_port, int baud_divisor)
 
 void NS16550_init(NS16550_t com_port, int baud_divisor)
 {
-#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_OMAP34XX))
+#if (defined(CONFIG_SPL_BUILD) && \
+               (defined(CONFIG_OMAP34XX) || defined(CONFIG_OMAP44XX)))
        /*
-        * On some OMAP3 devices when UART3 is configured for boot mode before
-        * SPL starts only THRE bit is set. We have to empty the transmitter
-        * before initialization starts.
+        * On some OMAP3/OMAP4 devices when UART3 is configured for boot mode
+        * before SPL starts only THRE bit is set. We have to empty the
+        * transmitter before initialization starts.
         */
        if ((serial_in(&com_port->lsr) & (UART_LSR_TEMT | UART_LSR_THRE))
             == UART_LSR_THRE) {
@@ -288,7 +289,38 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
        struct ns16550_platdata *plat = dev->platdata;
        fdt_addr_t addr;
 
+       /* try Processor Local Bus device first */
        addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
+#ifdef CONFIG_PCI
+       if (addr == FDT_ADDR_T_NONE) {
+               /* then try pci device */
+               struct fdt_pci_addr pci_addr;
+               u32 bar;
+               int ret;
+
+               /* we prefer to use a memory-mapped register */
+               ret = fdtdec_get_pci_addr(gd->fdt_blob, dev->of_offset,
+                                         FDT_PCI_SPACE_MEM32, "reg",
+                                         &pci_addr);
+               if (ret) {
+                       /* try if there is any i/o-mapped register */
+                       ret = fdtdec_get_pci_addr(gd->fdt_blob,
+                                                 dev->of_offset,
+                                                 FDT_PCI_SPACE_IO,
+                                                 "reg", &pci_addr);
+                       if (ret)
+                               return ret;
+               }
+
+               ret = fdtdec_get_pci_bar32(gd->fdt_blob, dev->of_offset,
+                                          &pci_addr, &bar);
+               if (ret)
+                       return ret;
+
+               addr = bar;
+       }
+#endif
+
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;