Merge "msm: Modify functional mode of suspened GPIO" (31c31c77) · Commits · e / devices / android_kernel_sony_msm8994

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

+21 −8

Original line number	Diff line number	Diff line
		@@ -23,6 +23,11 @@ static struct gpiomux_setting gpio_spi_config = {
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_NONE,
		};
		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_i2c_config = {
		.func = GPIOMUX_FUNC_3,
		@@ -265,25 +270,29 @@ static struct msm_gpiomux_config msm_atmel_configs[] __initdata = {
		{
		.gpio = 86, /* BLSP1 QUP4 SPI_DATA_MOSI */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 87, /* BLSP1 QUP4 SPI_DATA_MISO */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 89, /* BLSP1 QUP4 SPI_CLK */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 88, /* BLSP1 QUP4 SPI_CS */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		};
		@@ -306,25 +315,29 @@ static struct msm_gpiomux_config msm_focaltech_configs[] __initdata = {
		{
		.gpio = 86, /* BLSP1 QUP4 SPI_DATA_MOSI */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 87, /* BLSP1 QUP4 SPI_DATA_MISO */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 89, /* BLSP1 QUP4 SPI_CLK */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 88, /* BLSP1 QUP4 SPI_CS */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		};

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

+15 −5

Original line number	Diff line number	Diff line
		@@ -143,6 +143,11 @@ static struct gpiomux_setting gpio_spi_config = {
		.drv = GPIOMUX_DRV_12MA,
		.pull = GPIOMUX_PULL_NONE,
		};
		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_cs1_config = {
		.func = GPIOMUX_FUNC_GPIO,
		@@ -586,31 +591,36 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{
		.gpio = 0, /* BLSP1 QUP SPI_DATA_MOSI */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 1, /* BLSP1 QUP SPI_DATA_MISO */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 3, /* BLSP1 QUP SPI_CLK */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 9, /* BLSP1 QUP SPI_CS2A_N */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_cs2_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_cs2_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		{
		.gpio = 8, /* BLSP1 QUP SPI_CS1_N */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_cs1_config,
		[GPIOMUX_ACTIVE] = &gpio_spi_cs1_config,
		[GPIOMUX_SUSPENDED] = &gpio_spi_susp_config,
		},
		},
		#endif