Browse Source

tegra: add UART1 on GPU funcmux entry

TrimSlice uses UART1 on the GPU pingroup.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Stephen Warren 13 năm trước cách đây
mục cha
commit
e21649be56

+ 3 - 1
arch/arm/cpu/armv7/tegra2/board.c

@@ -102,8 +102,10 @@ int arch_cpu_init(void)
 #endif
 
 static int uart_configs[] = {
-#ifdef CONFIG_TEGRA2_UARTA_UAA_UAB
+#if defined(CONFIG_TEGRA2_UARTA_UAA_UAB)
 	FUNCMUX_UART1_UAA_UAB,
+#elif defined(CONFIG_TEGRA2_UARTA_GPU)
+	FUNCMUX_UART1_GPU,
 #else
 	FUNCMUX_UART1_IRRX_IRTX,
 #endif

+ 5 - 0
arch/arm/cpu/armv7/tegra2/funcmux.c

@@ -45,6 +45,11 @@ int funcmux_select(enum periph_id id, int config)
 			pinmux_tristate_disable(PINGRP_UAB);
 			bad_config = 0;
 			break;
+		case FUNCMUX_UART1_GPU:
+			pinmux_set_func(PINGRP_GPU, PMUX_FUNC_UARTA);
+			pinmux_tristate_disable(PINGRP_GPU);
+			bad_config = 0;
+			break;
 		}
 		if (!bad_config) {
 			/*

+ 1 - 0
arch/arm/include/asm/arch-tegra2/funcmux.h

@@ -31,6 +31,7 @@ enum {
 	/* UART configs */
 	FUNCMUX_UART1_IRRX_IRTX = 0,
 	FUNCMUX_UART1_UAA_UAB,
+	FUNCMUX_UART1_GPU,
 	FUNCMUX_UART2_IRDA = 0,
 	FUNCMUX_UART4_GMC = 0,