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 4b9a8f33e89daef1c9458be0b176e01211ab225e..667f60a9bb940fe27422dc1f27dd24b83fe464d7 100644 (file)
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -23,30 +23,76 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/tegra2.h>
-#include <asm/arch/gpio.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_TEGRA_MMC
+#include <mmc.h>
+#endif
 
+/* TODO: Remove this code when the SPI switch is working */
+#ifndef CONFIG_SPI_UART_SWITCH
 /*
- * Routine: gpio_config_uart
+ * Routine: gpio_config_uart_seaboard
  * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
  */
+static void gpio_config_uart_seaboard(void)
+{
+       /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
+       gpio_request(GPIO_PI3, NULL);
+       gpio_direction_output(GPIO_PI3, 0);
+}
+
 void gpio_config_uart(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;
+       if (machine_is_ventana())
+               return;
+       gpio_config_uart_seaboard();
+}
+#endif
 
-       /* 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)]);
+#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)
+{
+       funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT);
+       funcmux_select(PERIPH_ID_SDMMC3, FUNCMUX_SDMMC3_SDB_4BIT);
 
-       val = readl(&bank->gpio_out[GPIO_PORT(gp)]);
-       val &= ~(1 << GPIO_BIT(gp));
-       writel(val, &bank->gpio_out[GPIO_PORT(gp)]);
+       /* For power GPIO PI6 */
+       pinmux_tristate_disable(PINGRP_ATA);
+       /* For CD GPIO PI5 */
+       pinmux_tristate_disable(PINGRP_ATC);
+}
+
+/* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+       debug("board_mmc_init called\n");
+
+       /* Enable muxes, etc. for SDMMC controllers */
+       pin_mux_mmc();
+
+       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 */
+       tegra_mmc_init(0, 4, -1, -1);
 
-       val = readl(&bank->gpio_dir_out[GPIO_PORT(gp)]);
-       val |= 1 << GPIO_BIT(gp);
-       writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
+       debug("board_mmc_init: init SD slot\n");
+       /* init dev 1, SD slot, with 4-bit bus */
+       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);
 }