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

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

diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
index f1ab050899e062d7a1f5088ac9f0a61d3dca5b03..f27ad37b701e2e60a7b03e562111fae17b79e82b 100644 (file)
--- a/board/nvidia/harmony/harmony.c
+++ b/board/nvidia/harmony/harmony.c
@@ -24,6 +24,14 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/tegra2.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
 
 /*
  * Routine: gpio_config_uart
@@ -32,3 +40,45 @@
 void gpio_config_uart(void)
 {
 }
+
+#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_SDMMC2, FUNCMUX_SDMMC2_DTA_DTD_8BIT);
+
+       /* For power GPIO PI6 */
+       pinmux_tristate_disable(PINGRP_ATA);
+       /* For CD GPIO PH2 */
+       pinmux_tristate_disable(PINGRP_ATD);
+
+       /* For power GPIO PT3 */
+       pinmux_tristate_disable(PINGRP_DTB);
+       /* 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 SD slot J26\n");
+       /* init dev 0, SD slot J26, with 4-bit bus */
+       /* The board has an 8-bit bus, but 8-bit doesn't work yet */
+       tegra2_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
+
+       debug("board_mmc_init: init SD slot J5\n");
+       /* init dev 2, SD slot J5, with 4-bit bus */
+       tegra2_mmc_init(2, 4, GPIO_PT3, GPIO_PI5);
+
+       return 0;
+}
+#endif