Merge "msm: 8610: gpiomux: Configure nfc gpio clock source" (39ab60f8) · Commits · e / devices / android_kernel_sony_msm8994

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

+18 −7

Original line number	Diff line number	Diff line
		@@ -36,6 +36,17 @@ static struct gpiomux_setting gpio_cam_i2c_config = {
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting gpio_nfc_config = {
		.func = GPIOMUX_FUNC_2,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_NONE,
		};
		static struct gpiomux_setting gpio_nfc_sus_config = {
		.func = GPIOMUX_FUNC_2,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		};

		static struct gpiomux_setting atmel_int_act_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_8MA,
		@@ -227,6 +238,13 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &gpio_cam_i2c_config,
		},
		},
		{
		.gpio = 78, /* NFC CLK */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_nfc_config,
		[GPIOMUX_SUSPENDED] = &gpio_nfc_sus_config,
		},
		},
		};

		static struct msm_gpiomux_config msm_atmel_configs[] __initdata = {
		@@ -543,13 +561,6 @@ static struct msm_gpiomux_config msm_interrupt_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &interrupt_gpio_suspend_pullup,
		},
		},
		{
		.gpio = 78, /ETH_INT /
		.settings = {
		[GPIOMUX_ACTIVE] = &interrupt_gpio_active,
		[GPIOMUX_SUSPENDED] = &interrupt_gpio_suspend_pullup,
		},
		},
		{
		.gpio = 80, /ALSP_INT /
		.settings = {