Merge "msm: 8x26:Add active setting to SPI gpio on 8x26" (1cf2467e) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -73,17 +73,22 @@ static struct gpiomux_setting gpio_keys_suspend = {
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting gpio_spi_config = {
		static struct gpiomux_setting gpio_spi_act_config = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_8MA,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting gpio_spi_cs_config = {
		static struct gpiomux_setting gpio_spi_cs_act_config = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_DOWN,
		};
		static struct gpiomux_setting gpio_spi_susp_config = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		};

		static struct gpiomux_setting gpio_spi_cs_eth_config = {
		.func = GPIOMUX_FUNC_4,
		@@ -160,25 +165,29 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{
		.gpio = 0, /* BLSP1 QUP1 SPI_DATA_MOSI */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_act_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 1, /* BLSP1 QUP1 SPI_DATA_MISO */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_act_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 2, /* BLSP1 QUP1 SPI_CS1 */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_cs_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_cs_act_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 3, /* BLSP1 QUP1 SPI_CLK */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_act_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{