Merge "msm: gpio: apq8084: qca1530: gpio config for qca1530 chip." (dd7149ea) · Commits · e / devices / android_kernel_sony_msm8994

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

+37 −2

Original line number	Original line	Diff line number	Diff line
	@@ -810,6 +810,36 @@ static struct msm_gpiomux_config msm_sensor_configs[] __initdata = {
	},		},
	};		};

			static struct gpiomux_setting gpio_qca1530_config = {
			.func = GPIOMUX_FUNC_GPIO,
			.drv = GPIOMUX_DRV_6MA,
			.pull = GPIOMUX_PULL_NONE,
			};

			static struct msm_gpiomux_config msm_qca1530_cdp_configs[] __initdata = {
			{
			.gpio = 133, /* qca1530 reset */
			.settings = {
			[GPIOMUX_SUSPENDED] = &gpio_qca1530_config,
			},
			},
			};

			static struct msm_gpiomux_config msm_qca1530_liquid_configs[] __initdata = {
			{
			.gpio = 128, /* qca1530 reset */
			.settings = {
			[GPIOMUX_SUSPENDED] = &gpio_qca1530_config,
			},
			},
			{
			.gpio = 66, /* qca1530 power extra */
			.settings = {
			[GPIOMUX_SUSPENDED] = &gpio_qca1530_config,
			},
			},
			};

	void __init apq8084_init_gpiomux(void)		void __init apq8084_init_gpiomux(void)
	{		{
	int rc;		int rc;
	@@ -826,13 +856,18 @@ void __init apq8084_init_gpiomux(void)
	msm_gpiomux_install(msm_synaptics_configs,		msm_gpiomux_install(msm_synaptics_configs,
	ARRAY_SIZE(msm_synaptics_configs));		ARRAY_SIZE(msm_synaptics_configs));

	if (of_board_is_liquid())		if (of_board_is_liquid()) {
	msm_gpiomux_install(msm_blsp2_uart5_configs,		msm_gpiomux_install(msm_blsp2_uart5_configs,
	ARRAY_SIZE(msm_blsp2_uart5_configs));		ARRAY_SIZE(msm_blsp2_uart5_configs));
	else {		msm_gpiomux_install(msm_qca1530_liquid_configs,
			ARRAY_SIZE(msm_qca1530_liquid_configs));
			} else {
	msm_gpiomux_install(mdm_configs, ARRAY_SIZE(mdm_configs));		msm_gpiomux_install(mdm_configs, ARRAY_SIZE(mdm_configs));
	msm_gpiomux_install(msm_blsp2_uart1_configs,		msm_gpiomux_install(msm_blsp2_uart1_configs,
	ARRAY_SIZE(msm_blsp2_uart1_configs));		ARRAY_SIZE(msm_blsp2_uart1_configs));
			if (of_board_is_cdp())
			msm_gpiomux_install(msm_qca1530_cdp_configs,
			ARRAY_SIZE(msm_qca1530_cdp_configs));
	}		}
	msm_gpiomux_install(apq8084_hsic_configs,		msm_gpiomux_install(apq8084_hsic_configs,
	ARRAY_SIZE(apq8084_hsic_configs));		ARRAY_SIZE(apq8084_hsic_configs));