Merge "Revert "msm: camera: Add SKUF GPIO config"" (7efe6f4d) · Commits · e / devices / android_kernel_sony_msm8994

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

+12 −14

Original line number	Diff line number	Diff line
		@@ -85,6 +85,12 @@ static struct gpiomux_setting gpio_spi_cs_config = {
		.pull = GPIOMUX_PULL_DOWN,
		};

		static struct gpiomux_setting gpio_spi_cs_eth_config = {
		.func = GPIOMUX_FUNC_4,
		.drv = GPIOMUX_DRV_6MA,
		.pull = GPIOMUX_PULL_DOWN,
		};

		static struct gpiomux_setting wcnss_5wire_suspend_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		@@ -199,6 +205,12 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 22, /* BLSP1 QUP1 SPI_CS_ETH */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_spi_cs_eth_config,
		},
		},
		{ /* NFC */
		.gpio = 10, /* BLSP1 QUP3 I2C_DAT */
		.settings = {
		@@ -560,20 +572,6 @@ static struct msm_gpiomux_config msm_sensor_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &cam_settings[4],
		},
		},
		{
		.gpio = 22, /* CAM1_VDD */
		.settings = {
		[GPIOMUX_ACTIVE] = &cam_settings[3],
		[GPIOMUX_SUSPENDED] = &cam_settings[4],
		},
		},
		{
		.gpio = 34, /* CAM1 VCM_PWDN */
		.settings = {
		[GPIOMUX_ACTIVE] = &cam_settings[3],
		[GPIOMUX_SUSPENDED] = &cam_settings[4],
		},
		},
		{
		.gpio = 35, /* CAM2_STANDBY_N */
		.settings = {