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

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

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index aa77f12ef54c589c1508e7e37221c37bd362aec0..667f60a9bb940fe27422dc1f27dd24b83fe464d7 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -23,37 +23,27 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/tegra2.h>
+#include <asm/arch/tegra20.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
+#include <asm/arch/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 #include <mmc.h>
 #endif
-#include "../common/board.h"
 
+/* TODO: Remove this code when the SPI switch is working */
+#ifndef CONFIG_SPI_UART_SWITCH
 /*
  * Routine: gpio_config_uart_seaboard
  * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
  */
 static void gpio_config_uart_seaboard(void)
 {
-       int gp = GPIO_PI3;
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
-       u32 val;
-
        /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
-       val = readl(&bank->gpio_config[GPIO_PORT(gp)]);
-       val |= 1 << GPIO_BIT(gp);
-       writel(val, &bank->gpio_config[GPIO_PORT(gp)]);
-
-       val = readl(&bank->gpio_out[GPIO_PORT(gp)]);
-       val &= ~(1 << GPIO_BIT(gp));
-       writel(val, &bank->gpio_out[GPIO_PORT(gp)]);
-
-       val = readl(&bank->gpio_dir_out[GPIO_PORT(gp)]);
-       val |= 1 << GPIO_BIT(gp);
-       writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
+       gpio_request(GPIO_PI3, NULL);
+       gpio_direction_output(GPIO_PI3, 0);
 }
 
 void gpio_config_uart(void)
@@ -62,31 +52,17 @@ void gpio_config_uart(void)
                return;
        gpio_config_uart_seaboard();
 }
+#endif
 
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
 static void pin_mux_mmc(void)
 {
-       /* SDMMC4: config 3, x8 on 2nd set of pins */
-       pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
-       pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
-       pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
-
-       pinmux_tristate_disable(PINGRP_ATB);
-       pinmux_tristate_disable(PINGRP_GMA);
-       pinmux_tristate_disable(PINGRP_GME);
-
-       /* SDMMC3: SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
-       pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3);
-       pinmux_set_func(PINGRP_SDC, PMUX_FUNC_SDIO3);
-       pinmux_set_func(PINGRP_SDD, PMUX_FUNC_SDIO3);
-
-       pinmux_tristate_disable(PINGRP_SDC);
-       pinmux_tristate_disable(PINGRP_SDD);
-       pinmux_tristate_disable(PINGRP_SDB);
+       funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
+       funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_4BIT);
 
        /* For power GPIO PI6 */
        pinmux_tristate_disable(PINGRP_ATA);
@@ -105,12 +81,18 @@ int board_mmc_init(bd_t *bd)
        debug("board_mmc_init: init eMMC\n");
        /* init dev 0, eMMC chip, with 4-bit bus */
        /* The board has an 8-bit bus, but 8-bit doesn't work yet */
-       tegra2_mmc_init(0, 4, -1, -1);
+       tegra_mmc_init(0, 4, -1, -1);
 
        debug("board_mmc_init: init SD slot\n");
        /* init dev 1, SD slot, with 4-bit bus */
-       tegra2_mmc_init(1, 4, GPIO_PI6, GPIO_PI5);
+       tegra_mmc_init(1, 4, GPIO_PI6, GPIO_PI5);
 
        return 0;
 }
 #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);
+}