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/nvidia/seaboard/seaboard.c | |
parent | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff) | |
parent | 76a30fedd44428c7108084266389c9b4ba5678c8 (diff) | |
download | u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.zip u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.gz u-boot-imx-692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2.tar.bz2 |
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/nvidia/seaboard/seaboard.c')
-rw-r--r-- | board/nvidia/seaboard/seaboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 25480e4..2d07001 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -20,7 +20,7 @@ void gpio_early_init_uart(void) { /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */ - gpio_request(GPIO_PI3, NULL); + gpio_request(GPIO_PI3, "uart_en"); gpio_direction_output(GPIO_PI3, 0); } #endif |