diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
| commit | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch) | |
| tree | e47f18f7dd1507e91a46fcd6f550914ad3774f5a /board/armltd/vexpress64/vexpress64.c | |
| parent | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff) | |
| parent | 76a30fedd44428c7108084266389c9b4ba5678c8 (diff) | |
| download | talos-obmc-uboot-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.gz talos-obmc-uboot-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/armltd/vexpress64/vexpress64.c')
| -rw-r--r-- | board/armltd/vexpress64/vexpress64.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 876cb678eb..13dd667436 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -11,9 +11,22 @@ #include <netdev.h> #include <asm/io.h> #include <linux/compiler.h> +#include <dm/platdata.h> +#include <dm/platform_data/serial_pl01x.h> DECLARE_GLOBAL_DATA_PTR; +static const struct pl01x_serial_platdata serial_platdata = { + .base = V2M_UART0, + .type = TYPE_PL011, + .clock = 2400 * 1000, +}; + +U_BOOT_DEVICE(vexpress_serials) = { + .name = "serial_pl01x", + .platdata = &serial_platdata, +}; + int board_init(void) { return 0; |
