[U-Boot] [PATCH v3 5/7] serial: ns16550: Support ns16550 compatible pci uart devices

2014-12-30 Thread Bin Meng
There are many pci uart devices which are ns16550 compatible. We can
describe them in the board dts file and use it as the U-Boot serial
console as specified in the chosen node 'stdout-path' property.

Those pci uart devices can have their register be memory-mapped, or
i/o-mapped. The driver will try to use the memory-mapped register if
the reg property in the node has an entry to describe the memory-mapped
register, otherwise i/o-mapped register will be used.

Signed-off-by: Bin Meng 

---

Changes in v3:
- Update to use 'memory-mapped' and 'i/o-mapped' in several places
- Use 'Processor Local Bus' instead of 'plb'
- Change the logic in ns16550_serial_ofdata_to_platdata() to avoid goto

Changes in v2:
- New patch to support ns16550 compatible pci uart devices

 drivers/serial/ns16550.c | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index af5beba..70c9462 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -289,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;
 
-- 
1.8.2.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH v3 5/7] serial: ns16550: Support ns16550 compatible pci uart devices

2014-12-30 Thread Simon Glass
On 30 December 2014 at 07:53, Bin Meng  wrote:
> There are many pci uart devices which are ns16550 compatible. We can
> describe them in the board dts file and use it as the U-Boot serial
> console as specified in the chosen node 'stdout-path' property.
>
> Those pci uart devices can have their register be memory-mapped, or
> i/o-mapped. The driver will try to use the memory-mapped register if
> the reg property in the node has an entry to describe the memory-mapped
> register, otherwise i/o-mapped register will be used.
>
> Signed-off-by: Bin Meng 
>
> ---
>
> Changes in v3:
> - Update to use 'memory-mapped' and 'i/o-mapped' in several places
> - Use 'Processor Local Bus' instead of 'plb'
> - Change the logic in ns16550_serial_ofdata_to_platdata() to avoid goto
>
> Changes in v2:
> - New patch to support ns16550 compatible pci uart devices
>
>  drivers/serial/ns16550.c | 31 +++
>  1 file changed, 31 insertions(+)

Acked-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot