aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-02-02 10:11:12 -0500
committerTom Rini <trini@konsulko.com>2019-02-02 10:11:12 -0500
commit544d5e98f3657e4ac1966be8971586aa42dad8c4 (patch)
tree742ce50ddb331b05ea9a89db0faf1be4b35db8b5 /board
parent1b0769f2ed17ffc1cf9b32ad057bc8b160cbcbae (diff)
parent364e407f3cafd485db4d090430e3861c99858d42 (diff)
downloadu-boot-544d5e98f3657e4ac1966be8971586aa42dad8c4.zip
u-boot-544d5e98f3657e4ac1966be8971586aa42dad8c4.tar.gz
u-boot-544d5e98f3657e4ac1966be8971586aa42dad8c4.tar.bz2
Merge tag 'mips-pull-2019-02-01' of git://git.denx.de/u-boot-mips
- MIPS: mscc: jr2: small fixes - MIPS: mscc: luton: add ethernet and switch driver - MIPS: mt76xx: fix timer frequency
Diffstat (limited to 'board')
-rw-r--r--board/mscc/jr2/jr2.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c
index eac4dca..58a4a04 100644
--- a/board/mscc/jr2/jr2.c
+++ b/board/mscc/jr2/jr2.c
@@ -64,6 +64,13 @@ static void vcoreiii_gpio_set_alternate(int gpio, int mode)
}
}
+void board_debug_uart_init(void)
+{
+ /* too early for the pinctrl driver, so configure the UART pins here */
+ vcoreiii_gpio_set_alternate(10, 1);
+ vcoreiii_gpio_set_alternate(11, 1);
+}
+
static void do_board_detect(void)
{
int i;
@@ -73,6 +80,9 @@ static void do_board_detect(void)
for (i = 56; i < 60; i++)
vcoreiii_gpio_set_alternate(i, 1);
+ /* small delay for settling the pins */
+ mdelay(30);
+
if (mscc_phy_rd(0, 0x10, 0x3, &pval) == 0 &&
((pval >> 4) & 0x3F) == 0x3c) {
gd->board_type = BOARD_TYPE_PCB112; /* Serval2-NID */