diff options
author | Gregory Bean <gbean@codeaurora.org> | 2010-08-28 13:05:47 -0400 |
---|---|---|
committer | Daniel Walker <dwalker@codeaurora.org> | 2010-10-06 12:01:17 -0400 |
commit | 224f6de46ab05677f1fbfa7e384938639ff3f691 (patch) | |
tree | 90044b50dd725a9c86adb6bfac402f19b2febbed /arch/arm/mach-msm/board-msm7x30.c | |
parent | dd22b8f703d7a9aa5e40a7741b7e84fb0bb025d6 (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/board-msm7x30.c')
-rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index e32981928c77..74abb74b4983 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c | |||
@@ -39,22 +39,6 @@ | |||
39 | 39 | ||
40 | extern struct sys_timer msm_timer; | 40 | extern struct sys_timer msm_timer; |
41 | 41 | ||
42 | #ifdef CONFIG_SERIAL_MSM_CONSOLE | ||
43 | static struct msm_gpio uart2_config_data[] = { | ||
44 | { GPIO_CFG(49, 2, GPIO_OUTPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_RFR"}, | ||
45 | { GPIO_CFG(50, 2, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_CTS"}, | ||
46 | { GPIO_CFG(51, 2, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_Rx"}, | ||
47 | { GPIO_CFG(52, 2, GPIO_OUTPUT, GPIO_PULL_DOWN, GPIO_2MA), "UART2_Tx"}, | ||
48 | }; | ||
49 | |||
50 | static void msm7x30_init_uart2(void) | ||
51 | { | ||
52 | msm_gpios_request_enable(uart2_config_data, | ||
53 | ARRAY_SIZE(uart2_config_data)); | ||
54 | |||
55 | } | ||
56 | #endif | ||
57 | |||
58 | static struct platform_device *devices[] __initdata = { | 42 | static struct platform_device *devices[] __initdata = { |
59 | #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER) | 43 | #if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER) |
60 | &msm_device_uart2, | 44 | &msm_device_uart2, |
@@ -70,10 +54,6 @@ static void __init msm7x30_init_irq(void) | |||
70 | static void __init msm7x30_init(void) | 54 | static void __init msm7x30_init(void) |
71 | { | 55 | { |
72 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 56 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
73 | #ifdef CONFIG_SERIAL_MSM_CONSOLE | ||
74 | msm7x30_init_uart2(); | ||
75 | #endif | ||
76 | |||
77 | } | 57 | } |
78 | 58 | ||
79 | static void __init msm7x30_map_io(void) | 59 | static void __init msm7x30_map_io(void) |