Merge "ARM: msm: add active setting of I2C GPIO mux" (a4b62d8b) · Commits · e / devices / android_kernel_sony_msm8994

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -193,24 +193,28 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{
		.gpio = 14, /* BLSP1 QUP4 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 15, /* BLSP1 QUP4 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 18, /* BLSP1 QUP5 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 19, /* BLSP1 QUP5 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		@@ -223,12 +227,14 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{ /* NFC */
		.gpio = 10, /* BLSP1 QUP3 I2C_DAT */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{ /* NFC */
		.gpio = 11, /* BLSP1 QUP3 I2C_CLK */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		@@ -345,12 +351,14 @@ static struct msm_gpiomux_config msm_skuf_goodix_configs[] __initdata = {
		{
		.gpio = 18, /* BLSP1 QUP5 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 19, /* BLSP1 QUP5 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		@@ -419,12 +427,14 @@ static struct msm_gpiomux_config msm_skuf_nfc_configs[] __initdata = {
		{ /* NFC */
		.gpio = 10, /* BLSP1 QUP3 I2C_DAT */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{ /* NFC */
		.gpio = 11, /* BLSP1 QUP3 I2C_CLK */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -188,36 +188,42 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{
		.gpio = 2, /* BLSP1 QUP1 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 3, /* BLSP1 QUP1 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 10, /* BLSP1 QUP3 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 11, /* BLSP1 QUP3 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 16, /* BLSP1 QUP6 I2C_SDA */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_cam_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_cam_i2c_config,
		},
		},
		{
		.gpio = 17, /* BLSP1 QUP6 I2C_SCL */
		.settings = {
		[GPIOMUX_ACTIVE] = &gpio_cam_i2c_config,
		[GPIOMUX_SUSPENDED] = &gpio_cam_i2c_config,
		},
		},