diff options
Diffstat (limited to 'arch/arm/mach-msm/board-msm7x30.c')
-rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index 6f3b9735e970..0707cc041f27 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include <mach/vreg.h> | 37 | #include <mach/vreg.h> |
38 | #include "devices.h" | 38 | #include "devices.h" |
39 | #include "gpiomux.h" | ||
39 | #include "proc_comm.h" | 40 | #include "proc_comm.h" |
40 | 41 | ||
41 | extern struct sys_timer msm_timer; | 42 | extern struct sys_timer msm_timer; |
@@ -52,6 +53,27 @@ static struct msm_otg_platform_data msm_otg_pdata = { | |||
52 | .otg_control = OTG_PHY_CONTROL, | 53 | .otg_control = OTG_PHY_CONTROL, |
53 | }; | 54 | }; |
54 | 55 | ||
56 | struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = { | ||
57 | #ifdef CONFIG_SERIAL_MSM_CONSOLE | ||
58 | [49] = { /* UART2 RFR */ | ||
59 | .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN | | ||
60 | GPIOMUX_FUNC_2 | GPIOMUX_VALID, | ||
61 | }, | ||
62 | [50] = { /* UART2 CTS */ | ||
63 | .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN | | ||
64 | GPIOMUX_FUNC_2 | GPIOMUX_VALID, | ||
65 | }, | ||
66 | [51] = { /* UART2 RX */ | ||
67 | .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN | | ||
68 | GPIOMUX_FUNC_2 | GPIOMUX_VALID, | ||
69 | }, | ||
70 | [52] = { /* UART2 TX */ | ||
71 | .suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN | | ||
72 | GPIOMUX_FUNC_2 | GPIOMUX_VALID, | ||
73 | }, | ||
74 | #endif | ||
75 | }; | ||
76 | |||
55 | static struct platform_device *devices[] __initdata = { | 77 | static struct platform_device *devices[] __initdata = { |
56 | #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER) | 78 | #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER) |
57 | &msm_device_uart2, | 79 | &msm_device_uart2, |