msm: camera: Update correct i2c gpiomux config
Updated to use pull none in active state.
Use pull keeper in suspend state.
8ma in active and 2ma in suspend.
CRs-fixed: 304732
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 22cbf42..502f939 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -235,12 +235,6 @@
.pull = GPIOMUX_PULL_NONE,
};
-static struct gpiomux_setting gsbi4 = {
- .func = GPIOMUX_FUNC_1,
- .drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_NONE,
-};
-
static struct gpiomux_setting gsbi5 = {
.func = GPIOMUX_FUNC_1,
.drv = GPIOMUX_DRV_8MA,
@@ -344,18 +338,6 @@
},
},
{
- .gpio = 20, /* GSBI4 I2C QUP SDA */
- .settings = {
- [GPIOMUX_SUSPENDED] = &gsbi4,
- },
- },
- {
- .gpio = 21, /* GSBI4 I2C QUP SCL */
- .settings = {
- [GPIOMUX_SUSPENDED] = &gsbi4,
- },
- },
- {
.gpio = 22, /* GSBI5 UART2 */
.settings = {
[GPIOMUX_SUSPENDED] = &gsbi5,
@@ -499,7 +481,7 @@
{
.func = GPIOMUX_FUNC_1, /*active 3*/
.drv = GPIOMUX_DRV_8MA,
- .pull = GPIOMUX_PULL_UP,
+ .pull = GPIOMUX_PULL_NONE,
},
{
@@ -526,6 +508,12 @@
.pull = GPIOMUX_PULL_UP,
},
+ {
+ .func = GPIOMUX_FUNC_GPIO, /*i2c suspend*/
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_KEEPER,
+ },
+
};
static struct msm_gpiomux_config msm8960_cam_common_configs[] = {
@@ -578,28 +566,28 @@
.gpio = 18,
.settings = {
[GPIOMUX_ACTIVE] = &cam_settings[3],
- [GPIOMUX_SUSPENDED] = &cam_settings[0],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
},
},
{
.gpio = 19,
.settings = {
[GPIOMUX_ACTIVE] = &cam_settings[3],
- [GPIOMUX_SUSPENDED] = &cam_settings[0],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
},
},
{
.gpio = 20,
.settings = {
[GPIOMUX_ACTIVE] = &cam_settings[3],
- [GPIOMUX_SUSPENDED] = &cam_settings[0],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
},
},
{
.gpio = 21,
.settings = {
[GPIOMUX_ACTIVE] = &cam_settings[3],
- [GPIOMUX_SUSPENDED] = &cam_settings[0],
+ [GPIOMUX_SUSPENDED] = &cam_settings[8],
},
},
};