leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: ns16550: Add support for reg-offset property

Browse Source 
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: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Michal Simek 2016-02-16 16:05:23 +01:00
parent 39bc1a8c8f
commit d9a3bec682
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/serial/ns16550.c
View File

@ -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)
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)
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,

1
include/ns16550.h
View File

@ -54,6 +54,7 @@
*/ */
struct ns16550_platdata { struct ns16550_platdata {
unsigned long base; unsigned long base;
int reg_offset;
int reg_shift; int reg_shift;
int clock; int clock;
}; };