提交 df8ec55d 编写于 作者: P Paul Burton 提交者: Daniel Schwierzeck

dm: ns16550: Don't map_physmem for I/O ports

If the UART is to be accessed using I/O port accessors (inb & outb) then
using map_physmem doesn't make sense, since it operates in a different
memory space. Remove the call to map_physmem when
CONFIG_SYS_NS16550_PORT_MAPPED is defined, allowing I/O port addresses
to not be mangled by the incorrect mapping.
Signed-off-by: NPaul Burton <paul.burton@imgtec.com>
Signed-off-by: NDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
上级 49717b18
...@@ -100,7 +100,8 @@ static void ns16550_writeb(NS16550_t port, int offset, int value) ...@@ -100,7 +100,8 @@ static void ns16550_writeb(NS16550_t port, int offset, int value)
unsigned char *addr; unsigned char *addr;
offset *= 1 << plat->reg_shift; 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 * 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. * these options at run-time, so use the existing CONFIG options.
...@@ -114,7 +115,7 @@ static int ns16550_readb(NS16550_t port, int offset) ...@@ -114,7 +115,7 @@ static int ns16550_readb(NS16550_t port, int offset)
unsigned char *addr; unsigned char *addr;
offset *= 1 << plat->reg_shift; 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_offset, plat->reg_shift); return serial_in_shift(addr + plat->reg_offset, plat->reg_shift);
} }
...@@ -400,7 +401,12 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) ...@@ -400,7 +401,12 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
if (addr == FDT_ADDR_T_NONE) if (addr == FDT_ADDR_T_NONE)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_SYS_NS16550_PORT_MAPPED
plat->base = addr; 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, plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
"reg-offset", 0); "reg-offset", 0);
plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset, plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册