提交 59b35ddd 编写于 作者: M Michal Simek 提交者: Simon Glass

dm: ns16550: Add support for reg-offset property

reg-offset is the part of standard 8250 binding in the kernel.
It is shifting start of address space by reg-offset.
On Xilinx platform this offset is typically 0x1000.
Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NTom Rini <trini@konsulko.com>
Moved the new field to the end of the struct to avoid problems:
Signed-off-by: NSimon Glass <sjg@chromium.org>
上级 4428f3c8
...@@ -105,7 +105,7 @@ static void ns16550_writeb(NS16550_t port, int offset, int value) ...@@ -105,7 +105,7 @@ static void ns16550_writeb(NS16550_t port, int offset, int value)
* 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.
*/ */
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) static int ns16550_readb(NS16550_t port, int offset)
...@@ -116,7 +116,7 @@ static int ns16550_readb(NS16550_t port, int offset) ...@@ -116,7 +116,7 @@ static int ns16550_readb(NS16550_t port, int offset)
offset *= 1 << plat->reg_shift; offset *= 1 << plat->reg_shift;
addr = map_physmem(plat->base, 0, MAP_NOCACHE) + offset; addr = map_physmem(plat->base, 0, MAP_NOCACHE) + 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 */ /* We can clean these up once everything is moved to driver model */
...@@ -401,6 +401,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) ...@@ -401,6 +401,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
return -EINVAL; return -EINVAL;
plat->base = addr; plat->base = addr;
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, plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
"reg-shift", 0); "reg-shift", 0);
plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
......
...@@ -56,6 +56,7 @@ struct ns16550_platdata { ...@@ -56,6 +56,7 @@ struct ns16550_platdata {
unsigned long base; unsigned long base;
int reg_shift; int reg_shift;
int clock; int clock;
int reg_offset;
}; };
struct udevice; struct udevice;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册