summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/gpiomux-7x30.c
diff options
context:
space:
mode:
authorGregory Bean <gbean@codeaurora.org>2010-08-28 10:05:47 -0700
committerDaniel Walker <dwalker@codeaurora.org>2010-10-06 09:01:17 -0700
commit224f6de46ab05677f1fbfa7e384938639ff3f691 (patch)
tree90044b50dd725a9c86adb6bfac402f19b2febbed /arch/arm/mach-msm/gpiomux-7x30.c
parentdd22b8f703d7a9aa5e40a7741b7e84fb0bb025d6 (diff)
msm: convert 7x30 to gpiomux.
Change deprecated gpio_tlmm_config calls to gpiomux calls. Signed-off-by: Gregory Bean <gbean@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/gpiomux-7x30.c')
-rw-r--r--arch/arm/mach-msm/gpiomux-7x30.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/gpiomux-7x30.c b/arch/arm/mach-msm/gpiomux-7x30.c
index 7b380b31bd0e..6ce41c5241a5 100644
--- a/arch/arm/mach-msm/gpiomux-7x30.c
+++ b/arch/arm/mach-msm/gpiomux-7x30.c
@@ -16,4 +16,23 @@
*/
#include "gpiomux.h"
-struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {};
+struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
+#ifdef CONFIG_SERIAL_MSM_CONSOLE
+ [49] = { /* UART2 RFR */
+ .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+ GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+ },
+ [50] = { /* UART2 CTS */
+ .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+ GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+ },
+ [51] = { /* UART2 RX */
+ .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+ GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+ },
+ [52] = { /* UART2 TX */
+ .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |
+ GPIOMUX_FUNC_2 | GPIOMUX_VALID,
+ },
+#endif
+};