msm: camera: Change OV2720 to mclk1 for 8930
8930 uses mclk1 for front camera. Change cam0_clk to
cam1_clk for OV2720 sensor.
CRs-fixed: 353993
Change-Id: I7fcfc7920e5568ced979634f9c774cf142a783bd
Signed-off-by: Hody Hung <hhung@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930-camera.c b/arch/arm/mach-msm/board-8930-camera.c
index 1a7e2e1..d7ad549 100644
--- a/arch/arm/mach-msm/board-8930-camera.c
+++ b/arch/arm/mach-msm/board-8930-camera.c
@@ -91,6 +91,11 @@
.drv = GPIOMUX_DRV_2MA,
.pull = GPIOMUX_PULL_KEEPER,
},
+ {
+ .func = GPIOMUX_FUNC_2, /*active 9*/
+ .drv = GPIOMUX_DRV_2MA,
+ .pull = GPIOMUX_PULL_NONE,
+ },
};
@@ -113,7 +118,7 @@
{
.gpio = 4,
.settings = {
- [GPIOMUX_ACTIVE] = &cam_settings[1],
+ [GPIOMUX_ACTIVE] = &cam_settings[9],
[GPIOMUX_SUSPENDED] = &cam_settings[0],
},
},
@@ -369,16 +374,17 @@
};
static struct gpio msm8930_common_cam_gpio[] = {
- {5, GPIOF_DIR_IN, "CAMIF_MCLK"},
{20, GPIOF_DIR_IN, "CAMIF_I2C_DATA"},
{21, GPIOF_DIR_IN, "CAMIF_I2C_CLK"},
};
static struct gpio msm8930_front_cam_gpio[] = {
+ {4, GPIOF_DIR_IN, "CAMIF_MCLK"},
{76, GPIOF_DIR_OUT, "CAM_RESET"},
};
static struct gpio msm8930_back_cam_gpio[] = {
+ {5, GPIOF_DIR_IN, "CAMIF_MCLK"},
{107, GPIOF_DIR_OUT, "CAM_RESET"},
{54, GPIOF_DIR_OUT, "CAM_STBY_N"},
};
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 873db2d..0ebaaab 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5600,7 +5600,7 @@
CLK_LOOKUP("core_clk", pmic_ssbi2_clk.c, ""),
CLK_LOOKUP("mem_clk", rpm_msg_ram_p_clk.c, ""),
CLK_LOOKUP("cam_clk", cam0_clk.c, "4-001a"),
- CLK_LOOKUP("cam_clk", cam0_clk.c, "4-006c"),
+ CLK_LOOKUP("cam_clk", cam1_clk.c, "4-006c"),
CLK_LOOKUP("cam_clk", cam0_clk.c, "4-0048"),
CLK_LOOKUP("cam_clk", cam2_clk.c, NULL),
CLK_LOOKUP("cam_clk", cam0_clk.c, "4-0020"),