ARM: tegra: set MMC pin mux in board_init()

Most other pin mux is configured in this function. This removes the
need to do it in an MMC-specific initialization function, which is good
since that function is going away later in this series.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index e3cdb009ce923f648c0e6d3c109419c7fe753866..3f87891b25c808c7064e57a75988509ba54aca95 100644 (file)
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -53,6 +53,7 @@ U_BOOT_DEVICE(tegra_gpios) = {
 __weak void pinmux_init(void) {}
 __weak void pin_mux_usb(void) {}
 __weak void pin_mux_spi(void) {}
+__weak void pin_mux_mmc(void) {}
 __weak void gpio_early_init_uart(void) {}
 __weak void pin_mux_display(void) {}
 __weak void start_cpu_fan(void) {}
@@ -127,6 +128,10 @@ int board_init(void)
        pin_mux_spi();
 #endif
 
+#ifdef CONFIG_TEGRA_MMC
+       pin_mux_mmc();
+#endif
+
        /* Init is handled automatically in the driver-model case */
 #if defined(CONFIG_DM_VIDEO)
        pin_mux_display();
@@ -230,18 +235,11 @@ int board_late_init(void)
 }
 
 #if defined(CONFIG_TEGRA_MMC)
-__weak void pin_mux_mmc(void)
-{
-}
-
 /* this is a weak define that we are overriding */
 int board_mmc_init(bd_t *bd)
 {
        debug("%s called\n", __func__);
 
-       /* Enable muxes, etc. for SDMMC controllers */
-       pin_mux_mmc();
-
        debug("%s: init MMC\n", __func__);
        tegra_mmc_init();