diff mbox

[U-Boot,06/21] ARM: tegra: set MMC pin mux in board_init()

Message ID 20160913164602.23963-6-swarren@wwwdotorg.org
State Accepted
Commit c0be77dbdba504d24b6feb2f4669d8cac2497867
Delegated to: Tom Warren
Headers show

Commit Message

Stephen Warren Sept. 13, 2016, 4:45 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

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>
---
 arch/arm/mach-tegra/board2.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index e3cdb009ce92..3f87891b25c8 100644
--- 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();