diff options
| author | Dima Zavin <dima@android.com> | 2011-01-10 11:00:30 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-24 11:05:01 -0800 |
| commit | ba5499ebfb7bc7859039d782099c75d92c394016 (patch) | |
| tree | 6932774e48f0f3f19372df5217a79f5afcab1989 /arch/arm/mach-msm/board-msm7x30.c | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
| download | kernel_samsung_smdk4412-ba5499ebfb7bc7859039d782099c75d92c394016.zip kernel_samsung_smdk4412-ba5499ebfb7bc7859039d782099c75d92c394016.tar.gz kernel_samsung_smdk4412-ba5499ebfb7bc7859039d782099c75d92c394016.tar.bz2 | |
ARM: msm: 7x30: don't force a gpiomux table for the whole arch
This is completely board specific and therefore must be provided
on a per-board basis.
Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
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 6f3b973..0707cc0 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -36,6 +36,7 @@ #include <mach/vreg.h> #include "devices.h" +#include "gpiomux.h" #include "proc_comm.h" extern struct sys_timer msm_timer; @@ -52,6 +53,27 @@ static struct msm_otg_platform_data msm_otg_pdata = { .otg_control = OTG_PHY_CONTROL, }; +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 +}; + static struct platform_device *devices[] __initdata = { #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER) &msm_device_uart2, |