commit 53d27a8945e0d1d643574431eab3b1ef3aa032f9
author Jilai Wang <jilaiw@codeaurora.org> Wed Jul 13 14:32:58 2011 -0400
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:14:39 2011 -0700
tree 2b74eabd20c3d5e9e6d1d1aeafd38e7a16d1ef4c
parent 07c23dc9676a579be57898f472b7e81eaacabe21

board: msm8x60: Add Ov9726 support for 8660 dragon board.

Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>

arch/arm/mach-msm/board-msm8x60.c

diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index d412676..4515df0 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -1785,7 +1785,7 @@
 		return rc;
 	}
 
-	if (!machine_is_msm8x60_fluid()) {
+	if (!(machine_is_msm8x60_fluid() || machine_is_msm8x60_dragon())) {
 		rc = gpio_request(GPIO_WEB_CAMIF_STANDBY, "CAM_EN");
 		if (rc < 0) {
 			config_gpio_table(MSM_CAM_OFF);
@@ -1801,7 +1801,7 @@
 static void config_camera_off_gpios_web_cam(void)
 {
 	config_gpio_table(MSM_CAM_OFF);
-	if (!machine_is_msm8x60_fluid()) {
+	if (!(machine_is_msm8x60_fluid() || machine_is_msm8x60_dragon())) {
 		gpio_set_value_cansleep(GPIO_WEB_CAMIF_STANDBY, 1);
 		gpio_free(GPIO_WEB_CAMIF_STANDBY);
 	}
@@ -2376,6 +2376,11 @@
 };
 
 static struct i2c_board_info msm_camera_dragon_boardinfo[] __initdata = {
+	#ifdef CONFIG_WEBCAM_OV9726
+	{
+		I2C_BOARD_INFO("ov9726", 0x10),
+	},
+	#endif
 	#ifdef CONFIG_VX6953
 	{
 		I2C_BOARD_INFO("vx6953", 0x20),
@@ -9834,6 +9839,12 @@
 		pwrkey_pdata.pwrkey_time_ms = 0;
 	}
 
+	/* Specify reset pin for OV9726 */
+	if (machine_is_msm8x60_dragon()) {
+		msm_camera_sensor_ov9726_data.sensor_reset = 62;
+		ov9726_sensor_8660_info.mount_angle = 270;
+	}
+
 	if (machine_is_msm8x60_surf() || machine_is_msm8x60_ffa() ||
 	    machine_is_msm8x60_fluid() || machine_is_msm8x60_fusion() ||
 	    machine_is_msm8x60_fusn_ffa() || machine_is_msm8x60_dragon()) {