diff options
| -rw-r--r-- | src/soc/nvidia/tegra124/bootblock.c | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c index cd7ea34147..a3bed2309d 100644 --- a/src/soc/nvidia/tegra124/bootblock.c +++ b/src/soc/nvidia/tegra124/bootblock.c @@ -21,37 +21,13 @@ #include <arch/io.h> #include <cbfs.h> #include <console/console.h> +#include <delay.h> + +#include "clock.h" +#include "pinmux.h" static void hacky_hardcoded_uart_setup_function(void) { - int i; - - /* - * On poweron, AVP clock source (also called system clock) is set to - * PLLP_out0 with frequency set at 1MHz. Before initializing PLLP, we - * need to move the system clock's source to CLK_M temporarily. And - * then switch it to PLLP_out4 (204MHz) at a later time. - */ - write32((0 << 12) | (0 << 8) | (0 << 4) | (0 << 0) | (2 << 28), - (void *)(0x60006000 + 0x28)); - - // wait a little bit (nominally 2-3 us) - for (i = 0; i < 0x10000; i++) - __asm__ __volatile__(""); - - // Set function. - setbits_le32((void *)(0x70000000 + 0x3000 + 0x2e0), 3 << 0); - setbits_le32((void *)(0x70000000 + 0x3000 + 0x2e4), 3 << 0); - - // Output. - clrbits_le32((void *)(0x70000000 + 0x3000 + 0x2e0), 1 << 5); - // Input. - setbits_le32((void *)(0x70000000 + 0x3000 + 0x2e4), 1 << 5); - - // Disable tristate. - clrbits_le32((void *)(0x70000000 + 0x3000 + 0x2e0), 1 << 4); - clrbits_le32((void *)(0x70000000 + 0x3000 + 0x2e4), 1 << 4); - // Assert UART reset and enable clock. setbits_le32((void *)(0x60006000 + 4 + 0), 1 << 6); @@ -61,9 +37,7 @@ static void hacky_hardcoded_uart_setup_function(void) // Set the clock source. clrbits_le32((void *)(0x60006000 + 0x100 + 4 * 0x1e), 3 << 30); - // wait a little bit (nominally 2us?) - for (i = 0; i < 0x10000; i++) - __asm__ __volatile__(""); + udelay(2); // De-assert reset to UART. clrbits_le32((void *)(0x60006000 + 4 + 0), 1 << 6); @@ -73,8 +47,17 @@ void main(void) { void *entry; + set_avp_clock_to_clkm(); + hacky_hardcoded_uart_setup_function(); + // Serial out, tristate off. + pinmux_set_config(PINMUX_KB_ROW9_INDEX, PINMUX_KB_ROW9_FUNC_UA3); + // Serial in, tristate_on. + pinmux_set_config(PINMUX_KB_ROW10_INDEX, PINMUX_KB_ROW10_FUNC_UA3 | + PINMUX_TRISTATE | + PINMUX_INPUT_ENABLE); + if (CONFIG_BOOTBLOCK_CONSOLE) console_init(); |