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

Commit 9902b420 authored by Houston Hoffman's avatar Houston Hoffman
Browse files

msm: gpiomux: add the hisense nfc gpio 



Add the nfc gpio for the hisense device, and add the
compatibility of mtp device.

Change-Id: I40f5a2aad3ea682ad553b5974c1cc34803cff842
Signed-off-by: default avatarHouston Hoffman <hhoffman@codeaurora.org>
Signed-off-by: default avatarPan Fang <fangpan@codeaurora.org>
parent 0023b20a

arch/arm/mach-msm/board-8610-gpiomux.c

+27 −1
Original line number Diff line number Diff line
@@ -252,6 +252,29 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = { 
	},

};



static struct gpiomux_setting gpio_i2c_nfc_pvt_config = {

		.func = GPIOMUX_FUNC_5, /*active 1*/ /* 0 */

		.drv = GPIOMUX_DRV_2MA,

		.pull = GPIOMUX_PULL_NONE,

	};



static struct msm_gpiomux_config msm_nfc_configs[] __initdata = {

	{

		.gpio   = 8,            /* BLSP1 QUP2 I2C_SDA */

		.settings = {

			[GPIOMUX_ACTIVE] = &gpio_i2c_nfc_pvt_config,

			[GPIOMUX_SUSPENDED] = &gpio_i2c_nfc_pvt_config,

		},

	},

	{

		.gpio   = 9,            /* BLSP1 QUP2 I2C_SCL */

		.settings = {

			[GPIOMUX_ACTIVE] = &gpio_i2c_nfc_pvt_config,

			[GPIOMUX_SUSPENDED] = &gpio_i2c_nfc_pvt_config,

		},

	},

};



static struct msm_gpiomux_config msm_atmel_configs[] __initdata = {

	{

		.gpio      = 0,		/* TOUCH RESET */
@@ -625,7 +648,10 @@ void __init msm8610_init_gpiomux(void) 
	msm_gpiomux_install(msm_sensor_configs, ARRAY_SIZE(msm_sensor_configs));

	msm_gpiomux_install(msm_gpio_int_configs,

			ARRAY_SIZE(msm_gpio_int_configs));

	if (of_board_is_qrd())

	if (of_board_is_qrd()) {

		msm_gpiomux_install(msm_interrupt_configs,

			ARRAY_SIZE(msm_interrupt_configs));

		msm_gpiomux_install(msm_nfc_configs,

			ARRAY_SIZE(msm_nfc_configs));

	}

}