From e712e5451867e67f7e35aa4a931997e084b5b622 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 11 Jan 2012 12:42:27 +0000 Subject: [PATCH] tegra: Use funcmux for MMC on harmony Use the new funcmux_select() feature to set up the MMC pin mux. Signed-off-by: Simon Glass Signed-off-by: Tom Warren --- board/nvidia/harmony/harmony.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c index d5e147d269..8f8e7bf3fe 100644 --- a/board/nvidia/harmony/harmony.c +++ b/board/nvidia/harmony/harmony.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -46,27 +48,14 @@ void gpio_config_uart(void) */ 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); + 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); - /* SDMMC2: SDIO2_CLK, SDIO2_CMD, SDIO2_DAT[7:0] */ - pinmux_set_func(PINGRP_DTA, PMUX_FUNC_SDIO2); - pinmux_set_func(PINGRP_DTD, PMUX_FUNC_SDIO2); - - pinmux_tristate_disable(PINGRP_DTA); - pinmux_tristate_disable(PINGRP_DTD); - /* For power GPIO PT3 */ pinmux_tristate_disable(PINGRP_DTB); /* For CD GPIO PI5 */ -- 2.39.5