Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / board / nvidia / seaboard / seaboard.c

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 2d07001..0d5eec9 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/board.h>
 #include <asm/arch/clock.h>
@@ -20,12 +21,12 @@
 void gpio_early_init_uart(void)
 {
        /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
-       gpio_request(GPIO_PI3, "uart_en");
-       gpio_direction_output(GPIO_PI3, 0);
+       gpio_request(TEGRA_GPIO(I, 3), "uart_en");
+       gpio_direction_output(TEGRA_GPIO(I, 3), 0);
 }
 #endif
 
-#ifdef CONFIG_TEGRA_MMC
+#ifdef CONFIG_MMC_SDHCI_TEGRA
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
@@ -44,6 +45,12 @@ void pin_mux_mmc(void)
 
 void pin_mux_usb(void)
 {
-       /* For USB's GPIO PD0. For now, since we have no pinmux in fdt */
+       /* For USB0's GPIO PD0. For now, since we have no pinmux in fdt */
        pinmux_tristate_disable(PMUX_PINGRP_SLXK);
+       /* For USB1's ULPI signals */
+       funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI);
+       pinmux_set_func(PMUX_PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4);
+       pinmux_tristate_disable(PMUX_PINGRP_CDEV2);
+       /* USB1 PHY reset GPIO */
+       pinmux_tristate_disable(PMUX_PINGRP_UAC);
 }