Skip to contentSkip to conversation

tegra: add SDIO1 funcmux entry for UARTA

PATCH New Lucas Stach 2 participants 3 messages May 16, 2012 1 message not in the archive

Subsystems (2)
Arm (32-bit) Tegra architecture support
lore
Share & tools
lore

Lucas Stach

author
#0 lore raw

PATCH 1/1 tegra: add SDIO1 funcmux entry for UARTA

This is based on top of:
tegra: add alternate UART1 funcmux entry
tegra: add UART1 on GPU funcmux entry

While at it sync up the pingroup enum name with the TRM.

Signed-off-by Lucas Stach <[email protected]>
CC Stephen Warren <[email protected]>
CC Tom Warren <[email protected]>
CC Marek Vasut <[email protected]>
---
 arch/arm/cpu/armv7/tegra2/board.c          |    2 ++
 arch/arm/cpu/armv7/tegra2/funcmux.c        |    5 +++++
 arch/arm/include/asm/arch-tegra2/funcmux.h |    1 +
 arch/arm/include/asm/arch-tegra2/pinmux.h  |    2 +-

4 Dateien ge?ndert, 9 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-)

arch/arm/cpu/armv7/tegra2/board.c +2 -0
index 6106ef9..923678d 100644
@@ -106,6 +106,8 @@ static int uart_configs[] = {
 	FUNCMUX_UART1_UAA_UAB,
 #elif defined(CONFIG_TEGRA2_UARTA_GPU)
 	FUNCMUX_UART1_GPU,
+#elif defined(CONFIG_TEGRA2_UARTA_SDIO1)
+	FUNCMUX_UART1_SDIO1,
 #else
 	FUNCMUX_UART1_IRRX_IRTX,
 #endif
arch/arm/cpu/armv7/tegra2/funcmux.c +5 -0
index c279088..1559869 100644
@@ -50,6 +50,11 @@ int funcmux_select(enum periph_id id, int config)
 			pinmux_tristate_disable(PINGRP_GPU);
 			bad_config = 0;
 			break;
+		case FUNCMUX_UART1_SDIO1:
+			pinmux_set_func(PINGRP_SDIO1, PMUX_FUNC_UARTA);
+			pinmux_tristate_disable(PINGRP_SDIO1);
+			bad_config = 0;
+			break;
 		}
 		if (!bad_config) {
 			/*
arch/arm/include/asm/arch-tegra2/funcmux.h +1 -0
index dba2cf5..19184d1 100644
@@ -32,6 +32,7 @@ enum {
 	FUNCMUX_UART1_IRRX_IRTX = 0,
 	FUNCMUX_UART1_UAA_UAB,
 	FUNCMUX_UART1_GPU,
+	FUNCMUX_UART1_SDIO1,
 	FUNCMUX_UART2_IRDA = 0,
 	FUNCMUX_UART4_GMC = 0,
arch/arm/include/asm/arch-tegra2/pinmux.h +1 -1
index 469d742..03fa7ca 100644
@@ -67,7 +67,7 @@ enum pmux_pingrp {
 	PINGRP_KBCF,
 	PINGRP_GMA,
 	PINGRP_GMC,
-	PINGRP_SDMMC1,
+	PINGRP_SDIO1,
 	PINGRP_OWC,
 
 	/* 32: APB_MISC_PP_TRISTATE_REG_B_0 */
Signature · 1 line
1.7.10.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#3 lore raw

PATCH 1/1 tegra: add SDIO1 funcmux entry for UARTA

Am Mittwoch, den 16.05.2012, 10:59 -0700 schrieb Tom Warren:

Quoted 93 lines

Lucas,

Quoted 74 lines

-----Original Message-----
From: Lucas Stach [mailto:dev at lynxeye.de]
Sent: Wednesday, May 16, 2012 9:29 AM
To: u-boot at lists.denx.de
Cc: Stephen Warren; Tom Warren; Marek Vasut
Subject: [PATCH] tegra: add SDIO1 funcmux entry for UARTA

This is based on top of:
tegra: add alternate UART1 funcmux entry
tegra: add UART1 on GPU funcmux entry

While at it sync up the pingroup enum name with the TRM.

Signed-off-by Lucas Stach <[email protected]>
CC Stephen Warren <[email protected]>
CC Tom Warren <[email protected]>
CC Marek Vasut <[email protected]>
---
 arch/arm/cpu/armv7/tegra2/board.c          |    2 ++
 arch/arm/cpu/armv7/tegra2/funcmux.c        |    5 +++++
 arch/arm/include/asm/arch-tegra2/funcmux.h |    1 +
 arch/arm/include/asm/arch-tegra2/pinmux.h  |    2 +-

4 Dateien ge?ndert, 9 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-)

arch/arm/cpu/armv7/tegra2/board.c +2 -0
index 6106ef9..923678d 100644
@@ -106,6 +106,8 @@ static int uart_configs[] = {
 	FUNCMUX_UART1_UAA_UAB,
 #elif defined(CONFIG_TEGRA2_UARTA_GPU)
 	FUNCMUX_UART1_GPU,
+#elif defined(CONFIG_TEGRA2_UARTA_SDIO1)
+	FUNCMUX_UART1_SDIO1,
 #else
 	FUNCMUX_UART1_IRRX_IRTX,
 #endif
arch/arm/cpu/armv7/tegra2/funcmux.c +5 -0
index c279088..1559869 100644
@@ -50,6 +50,11 @@ int funcmux_select(enum periph_id id, int config)
 			pinmux_tristate_disable(PINGRP_GPU);
 			bad_config = 0;
 			break;
+		case FUNCMUX_UART1_SDIO1:
+			pinmux_set_func(PINGRP_SDIO1, PMUX_FUNC_UARTA);
+			pinmux_tristate_disable(PINGRP_SDIO1);
+			bad_config = 0;
+			break;
 		}
 		if (!bad_config) {
 			/*
arch/arm/include/asm/arch-tegra2/funcmux.h +1 -0
index dba2cf5..19184d1 100644
@@ -32,6 +32,7 @@ enum {
 	FUNCMUX_UART1_IRRX_IRTX = 0,
 	FUNCMUX_UART1_UAA_UAB,
 	FUNCMUX_UART1_GPU,
+	FUNCMUX_UART1_SDIO1,
 	FUNCMUX_UART2_IRDA = 0,
 	FUNCMUX_UART4_GMC = 0,
arch/arm/include/asm/arch-tegra2/pinmux.h +0 -0
index 469d742..03fa7ca 100644

arch/arm/include/asm/arch-tegra2/pinmux.h enum pmux_pingrp { · line 70

Quoted 5 lines
arch/arm/include/asm/arch-tegra2/pinmux.h +1 -1
@@ -67,7 +67,7 @@ enum pmux_pingrp {
 	PINGRP_KBCF,
 	PINGRP_GMA,
 	PINGRP_GMC,
-	PINGRP_SDMMC1,
+	PINGRP_SDIO1,

This breaks Stephen's PAZ00 support (commit 2996e2dcc in u-boot-tegra/master, 'tegra2: Add support for Compal Paz00'):

Configuring for paz00 board...
paz00.c: In function 'pin_mux_mmc':
paz00.c:52: error: 'PINGRP_SDMMC1' undeclared (first use in this function) paz00.c:52: error: (Each undeclared identifier is reported only once paz00.c:52: error: for each function it appears in.)
make[1]: *** [paz00.o] Error 1
make: *** [board/compal/paz00/libpaz00.o] Error 2 arm-none-linux-gnueabi-size: './u-boot': No such file

Quoted 1 line

Please fix, and be sure to test all patches with MAKEALL -s tegra2, and (at least) MAKEALL -c armv7 if they touch common code.

Oh, sorry. Thanks for the heads-up.

As the churn of the sync is bigger than I thought, I will split up this patch. Updated patches follow in a minute.

Thanks,
Lucas

Quoted 9 lines

Thanks,

Tom

Quoted 5 lines
arch/arm/include/asm/arch-tegra2/pinmux.h +0 -1
 	PINGRP_OWC,
 
 	/* 32: APB_MISC_PP_TRISTATE_REG_B_0 */
--

1.7.10.1