Browse Source

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>
Stephen Warren 13 years ago
parent
commit
a016e144ed
2 changed files with 13 additions and 0 deletions
  1. 10 0
      arch/arm/cpu/armv7/tegra2/funcmux.c
  2. 3 0
      arch/arm/include/asm/arch-tegra2/funcmux.h

+ 10 - 0
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;

+ 3 - 0
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,
 };
 
 /**