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

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

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index a4af5391b41684bd70026a9d711fa322f4ed166e..d1d8a29cbaa1ae689c98348e435a6a65a265d9cb 100644 (file)
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -131,10 +131,11 @@ int board_init(void)
 #ifdef CONFIG_SPI_UART_SWITCH
        gpio_config_uart();
 #endif
-#ifdef CONFIG_TEGRA_SPI
+#if defined(CONFIG_TEGRA_SPI) || defined(CONFIG_TEGRA_SLINK)
        pin_mux_spi();
        spi_init();
 #endif
+
 #ifdef CONFIG_PWM_TEGRA
        if (pwm_init(gd->fdt_blob))
                debug("%s: Failed to init pwm\n", __func__);
@@ -196,7 +197,7 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init")));
 
 int board_early_init_f(void)
 {
-#if defined(CONFIG_TEGRA30)
+#if !defined(CONFIG_TEGRA20)
        pinmux_init();
 #endif
        board_init_uart_f();