tegra: add SDMMC1 on SDIO1 funcmux entry

This will be used on TrimSlice.

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

diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c b/arch/arm/cpu/armv7/tegra2/funcmux.c
index 155986932a2d183f03147e6b290aa07efe73ae17..820ba4e902dc0e08163c882498c6d1496ada5942 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/funcmux.c
+++ b/arch/arm/cpu/armv7/tegra2/funcmux.c
@@ -127,6 +127,13 @@ int funcmux_select(enum periph_id id, int config)
                }
                break;
 
+       case PERIPH_ID_SDMMC1:
+               if (config == FUNCMUX_SDMMC1_SDIO1_4BIT) {
+                       pinmux_set_func(PINGRP_SDIO1, PMUX_FUNC_SDIO1);
+                       pinmux_tristate_disable(PINGRP_SDIO1);
+               }
+               break;
+
        case PERIPH_ID_SDMMC2:
                if (config == FUNCMUX_SDMMC2_DTA_DTD_8BIT) {
                        pinmux_set_func(PINGRP_DTA, PMUX_FUNC_SDIO2);

diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h b/arch/arm/include/asm/arch-tegra2/funcmux.h
index 19184d1d29bc6d6d8a9907e7f6443a3433811bb5..b16c496122a06422b2da7ca92d8f0dab4bd3ab49 100644 (file)
--- a/arch/arm/include/asm/arch-tegra2/funcmux.h
+++ b/arch/arm/include/asm/arch-tegra2/funcmux.h
@@ -44,6 +44,7 @@ enum {
        FUNCMUX_I2C3_DTF = 0,
 
        /* SDMMC configs */
+       FUNCMUX_SDMMC1_SDIO1_4BIT = 0,
        FUNCMUX_SDMMC2_DTA_DTD_8BIT = 0,
        FUNCMUX_SDMMC3_SDB_4BIT = 0,
        FUNCMUX_SDMMC3_SDB_SLXA_8BIT,