Merge "msm: gpiomux: add the hisense nfc gpio" (abbcc196) · Commits · e / devices / android_kernel_sony_msm8994

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));
		}
		}