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

[karo-tx-uboot.git] / board / nvidia / seaboard / seaboard.c

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index ef4e481c75f1a060b4aa9a7b1a0db3f219fc9542..11472ebaf20d1eb385457cf8745322460e7b94bc 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
+#include <asm/arch-tegra/board.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
 #include <asm/arch/gpio.h>
@@ -22,7 +23,7 @@ void gpio_early_init_uart(void)
 #ifndef CONFIG_SPL_BUILD
        gpio_request(GPIO_PI3, NULL);
 #endif
-       gpio_direction_output(GPIO_PI3, 0);
+       tegra_spl_gpio_direction_output(GPIO_PI3, 0);
 }
 #endif
 
@@ -37,14 +38,14 @@ void pin_mux_mmc(void)
        funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_4BIT);
 
        /* For power GPIO PI6 */
-       pinmux_tristate_disable(PINGRP_ATA);
+       pinmux_tristate_disable(PMUX_PINGRP_ATA);
        /* For CD GPIO PI5 */
-       pinmux_tristate_disable(PINGRP_ATC);
+       pinmux_tristate_disable(PMUX_PINGRP_ATC);
 }
 #endif
 
 void pin_mux_usb(void)
 {
        /* For USB's GPIO PD0. For now, since we have no pinmux in fdt */
-       pinmux_tristate_disable(PINGRP_SLXK);
+       pinmux_tristate_disable(PMUX_PINGRP_SLXK);
 }