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>

diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c
index 629ad5d67f89db55e68147decca994d5415b67ae..6106ef99922c758df61641ef6dcd9f4096f77144 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/board.c
+++ b/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

diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c b/arch/arm/cpu/armv7/tegra2/funcmux.c
index e2d1273dc91e9ee7a868d289b1e81aac8271310c..c27908821a1423f12b55bf838aaafa3fd41e7bc4 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/funcmux.c
+++ b/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) {
                        /*

diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h b/arch/arm/include/asm/arch-tegra2/funcmux.h
index b455122594de3351697f52fa6583cae64f5cf250..dba2cf50d0c2c00202f35ceef0968bcb2bbd603e 100644 (file)
--- a/arch/arm/include/asm/arch-tegra2/funcmux.h
+++ b/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,