diff options
| author | Simon Glass <sjg@chromium.org> | 2012-07-29 20:53:26 +0000 | 
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2012-09-07 13:54:30 -0700 | 
| commit | 35e1132c88eb75f6cde2ffcc47696584356879c0 (patch) | |
| tree | ddf8f68fe545c71c1a32c6f6f0e2106ac87351a6 | |
| parent | b572595ee95829ab62e354c55a8fbd0f4db23935 (diff) | |
| download | olio-uboot-2014.01-35e1132c88eb75f6cde2ffcc47696584356879c0.tar.xz olio-uboot-2014.01-35e1132c88eb75f6cde2ffcc47696584356879c0.zip | |
tegra: Add NAND support to funcmux
Add selection of NAND flash pins to the funcmux.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
| -rw-r--r-- | arch/arm/cpu/tegra20-common/funcmux.c | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra20/funcmux.h | 3 | 
2 files changed, 10 insertions, 0 deletions
| diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/cpu/tegra20-common/funcmux.c index 8cfed645c..b2129adf2 100644 --- a/arch/arm/cpu/tegra20-common/funcmux.c +++ b/arch/arm/cpu/tegra20-common/funcmux.c @@ -234,6 +234,13 @@ int funcmux_select(enum periph_id id, int config)  		}  		break; +	case PERIPH_ID_NDFLASH: +		if (config == FUNCMUX_NDFLASH_ATC) { +			pinmux_set_func(PINGRP_ATC, PMUX_FUNC_NAND); +			pinmux_tristate_disable(PINGRP_ATC); +		} +		break; +  	default:  		debug("%s: invalid periph_id %d", __func__, id);  		return -1; diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h index 258f7b641..bd511db85 100644 --- a/arch/arm/include/asm/arch-tegra20/funcmux.h +++ b/arch/arm/include/asm/arch-tegra20/funcmux.h @@ -57,6 +57,9 @@ enum {  	/* Serial Flash configs */  	FUNCMUX_SPI1_GMC_GMD = 0, + +	/* NAND flags */ +	FUNCMUX_NDFLASH_ATC = 0,  };  /** |