diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-06-12 08:33:39 +0000 |
|---|---|---|
| committer | Albert ARIBAUD (U-Boot) <uboot@lilith.(none)> | 2012-07-09 22:44:33 +0200 |
| commit | a016e144ed6a7e17774d3371c29544c329459667 (patch) | |
| tree | 7593020c947435a83d262e1a848864c5b0858208 /arch | |
| parent | f78d348cb8a4f5f69a80f914e84eabd8663783a3 (diff) | |
tegra: add GMC/GMD funcmux entry for SFLASH
This is 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 | 10 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra2/funcmux.h | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c b/arch/arm/cpu/armv7/tegra2/funcmux.c index 455d01011f..4a31a4cf0c 100644 --- a/arch/arm/cpu/armv7/tegra2/funcmux.c +++ b/arch/arm/cpu/armv7/tegra2/funcmux.c @@ -224,6 +224,16 @@ int funcmux_select(enum periph_id id, int config) } break; + case PERIPH_ID_SPI1: + if (config == FUNCMUX_SPI1_GMC_GMD) { + pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); + pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH); + + pinmux_tristate_disable(PINGRP_GMC); + pinmux_tristate_disable(PINGRP_GMD); + } + break; + default: debug("%s: invalid periph_id %d", __func__, id); return -1; diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h b/arch/arm/include/asm/arch-tegra2/funcmux.h index 3cbc7d2fe1..dcd512f084 100644 --- a/arch/arm/include/asm/arch-tegra2/funcmux.h +++ b/arch/arm/include/asm/arch-tegra2/funcmux.h @@ -54,6 +54,9 @@ enum { /* USB configs */ FUNCMUX_USB2_ULPI = 0, + + /* Serial Flash configs */ + FUNCMUX_SPI1_GMC_GMD = 0, }; /** |