[U-Boot] [PATCH 1/2] tegra: add SDMMC1 on SDIO1 funcmux entry

[Simon Glass]

Hi Stephen,

On Wed, May 16, 2012 at 4:54 PM, Stephen Warren <swarren at wwwdotorg.org>wrote:

> From: Stephen Warren <swarren at nvidia.com>
>
> This will be used on TrimSlice.
>
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  arch/arm/cpu/armv7/tegra2/funcmux.c        |    7 +++++++
>  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 1559869..820ba4e 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);
> +               }
>

else return -1 I think


> +               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 19184d1..b16c496 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,
>

The name does not seem consistent - is it not possible to route this
peripheral to different pins?


>        FUNCMUX_SDMMC2_DTA_DTD_8BIT = 0,
>        FUNCMUX_SDMMC3_SDB_4BIT = 0,
>        FUNCMUX_SDMMC3_SDB_SLXA_8BIT,
> --
> 1.7.0.4
>
>
Regards,
Simon