Merge "msm: gpio: apq8084: qca1530: VPG_PWR_M2_EN from Liquid to M.2 card" (3828cea5) · Commits · e / devices / android_kernel_sony_msm8994

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -816,6 +816,12 @@ static struct gpiomux_setting gpio_qca1530_config = {
	.pull = GPIOMUX_PULL_NONE,		.pull = GPIOMUX_PULL_NONE,
	};		};

			static struct gpiomux_setting gpio_qca1530_config_mpp7 = {
			.func = GPIOMUX_FUNC_GPIO,
			.drv = GPIOMUX_DRV_6MA,
			.pull = GPIOMUX_PULL_UP,
			};

	static struct msm_gpiomux_config msm_qca1530_cdp_configs[] __initdata = {		static struct msm_gpiomux_config msm_qca1530_cdp_configs[] __initdata = {
	{		{
	.gpio = 133, /* qca1530 reset */		.gpio = 133, /* qca1530 reset */
	@@ -835,7 +841,7 @@ static struct msm_gpiomux_config msm_qca1530_liquid_configs[] __initdata = {
	{		{
	.gpio = 66, /* qca1530 power extra */		.gpio = 66, /* qca1530 power extra */
	.settings = {		.settings = {
	[GPIOMUX_SUSPENDED] = &gpio_qca1530_config,		[GPIOMUX_SUSPENDED] = &gpio_qca1530_config_mpp7,
	},		},
	},		},
	};		};