diff options
| author | Stephen Warren | 2012-05-16 13:54:06 +0000 |
|---|---|---|
| committer | Albert ARIBAUD | 2012-07-07 14:07:18 +0200 |
| commit | d1e4607901883c84a2f727c9ae2dac3cfcfd2b91 (patch) | |
| tree | e32c333a2b2ed65bdfbfe6d4aa5e2ad1af96fd14 /arch | |
| parent | a2cfe63eeb6a09c52a748849590a898f1032aeea (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/funcmux.c | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/funcmux.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c b/arch/arm/cpu/armv7/tegra2/funcmux.c index 155986932a2..820ba4e902d 100644 --- 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 19184d1d29b..b16c496122a 100644 --- 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, |