Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224f6de4 authored by Gregory Bean's avatar Gregory Bean Committed by Daniel Walker
Browse files

msm: convert 7x30 to gpiomux. 



Change deprecated gpio_tlmm_config calls to gpiomux calls.

Signed-off-by: default avatarGregory Bean <gbean@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent dd22b8f7

arch/arm/mach-msm/board-msm7x30.c

+0 −20
Original line number Diff line number Diff line
@@ -39,22 +39,6 @@ 


extern struct sys_timer msm_timer;



#ifdef CONFIG_SERIAL_MSM_CONSOLE

static struct msm_gpio uart2_config_data[] = {

	{ GPIO_CFG(49, 2, GPIO_OUTPUT,  GPIO_PULL_DOWN, GPIO_2MA), "UART2_RFR"},

	{ GPIO_CFG(50, 2, GPIO_INPUT,   GPIO_PULL_DOWN, GPIO_2MA), "UART2_CTS"},

	{ GPIO_CFG(51, 2, GPIO_INPUT,   GPIO_PULL_DOWN, GPIO_2MA), "UART2_Rx"},

	{ GPIO_CFG(52, 2, GPIO_OUTPUT,  GPIO_PULL_DOWN, GPIO_2MA), "UART2_Tx"},

};



static void msm7x30_init_uart2(void)

{

	msm_gpios_request_enable(uart2_config_data,

			ARRAY_SIZE(uart2_config_data));



}

#endif



static struct platform_device *devices[] __initdata = {

#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)

        &msm_device_uart2,
@@ -70,10 +54,6 @@ static void __init msm7x30_init_irq(void) 
static void __init msm7x30_init(void)

{

	platform_add_devices(devices, ARRAY_SIZE(devices));

#ifdef CONFIG_SERIAL_MSM_CONSOLE

	msm7x30_init_uart2();

#endif



}



static void __init msm7x30_map_io(void)

arch/arm/mach-msm/gpiomux-7x30.c

+20 −1
Original line number Diff line number Diff line
@@ -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

};