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

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

msm: convert 8x50 to gpiomux. 



Change the gpio-init code from deprecated gpio_tlmm_config
to the new gpiomux api.

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

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

+0 −12
Original line number Original line Diff line number Diff line
@@ -35,21 +35,10 @@ 




extern struct sys_timer msm_timer;

extern struct sys_timer msm_timer;





static struct msm_gpio uart3_config_data[] = {

	{ GPIO_CFG(86, 1, GPIO_INPUT,   GPIO_PULL_DOWN, GPIO_2MA), "UART2_Rx"},

	{ GPIO_CFG(87, 1, GPIO_OUTPUT,  GPIO_PULL_DOWN, GPIO_2MA), "UART2_Tx"},

};



static struct platform_device *devices[] __initdata = {

static struct platform_device *devices[] __initdata = {

	&msm_device_uart3,

	&msm_device_uart3,

};

};





static void msm8x50_init_uart3(void)

{

	msm_gpios_request_enable(uart3_config_data,

				ARRAY_SIZE(uart3_config_data));

}



static void __init qsd8x50_map_io(void)

static void __init qsd8x50_map_io(void)

{

{

	msm_map_qsd8x50_io();

	msm_map_qsd8x50_io();
@@ -64,7 +53,6 @@ static void __init qsd8x50_init_irq(void) 




static void __init qsd8x50_init(void)

static void __init qsd8x50_init(void)

{

{

	msm8x50_init_uart3();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	platform_add_devices(devices, ARRAY_SIZE(devices));

}

}

arch/arm/mach-msm/gpiomux-8x50.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -16,4 +16,13 @@ 
 */

 */

#include "gpiomux.h"

#include "gpiomux.h"





struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {};
 
struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {

	[86] = { /* UART3 RX */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_1 | GPIOMUX_VALID,

	},

	[87] = { /* UART3 TX */

		.suspended = GPIOMUX_DRV_2MA | GPIOMUX_PULL_DOWN |

			     GPIOMUX_FUNC_1 | GPIOMUX_VALID,

	},

};