commit 9f000a7c4c1ea865aedf82d9db8157e106b84507
author Aparna Mallavarapu <aparnam@codeaurora.org> Fri Apr 20 15:37:57 2012 +0530
committer Aparna Mallavarapu <aparnam@codeaurora.org> Mon May 07 20:45:21 2012 +0530
tree 8735ecbc15218a6c945cb697da61b78ce22e7766
parent dafd5a663dd1f23bb5c4aff2243b1d7e3934b412

msm: board-msm7x27a: Add support for 8625 FFA

Support MSM8625 FFA for the new machine

CRs-Fixed: 353709
Change-Id: Ic5d8942e4e942b076700f028eb1495c4d84b426e
Signed-off-by: Aparna Mallavarapu <aparnam@codeaurora.org>

arch/arm/mach-msm/board-msm7627a-camera.c

diff --git a/arch/arm/mach-msm/board-msm7627a-camera.c b/arch/arm/mach-msm/board-msm7627a-camera.c
index 9d01d90..8e64a43 100644
--- a/arch/arm/mach-msm/board-msm7627a-camera.c
+++ b/arch/arm/mach-msm/board-msm7627a-camera.c
@@ -284,7 +284,8 @@
 static void __init msm7x27a_init_cam(void)
 {
 	if (!(machine_is_msm7x27a_ffa() || machine_is_msm7625a_ffa()
-				|| machine_is_msm7627a_qrd1())) {
+				|| machine_is_msm7627a_qrd1()
+				|| machine_is_msm8625_ffa())) {
 		sensor_board_info_s5k4e1.cam_vreg = NULL;
 		sensor_board_info_s5k4e1.num_vreg = 0;
 		sensor_board_info_mt9e013.cam_vreg = NULL;
@@ -523,7 +524,8 @@
 	int rc = 0;
 
 	if (machine_is_msm7x27a_ffa() || machine_is_msm7625a_ffa()
-				|| machine_is_msm7627a_qrd1())
+				|| machine_is_msm7627a_qrd1()
+				|| machine_is_msm8625_ffa())
 		msm_camera_vreg_config(1);
 
 	rc = config_gpio_table(camera_on_gpio_table,
@@ -540,7 +542,8 @@
 static void config_camera_off_gpios_rear(void)
 {
 	if (machine_is_msm7x27a_ffa() || machine_is_msm7625a_ffa()
-				|| machine_is_msm7627a_qrd1())
+				|| machine_is_msm7627a_qrd1()
+				|| machine_is_msm8625_ffa())
 		msm_camera_vreg_config(0);
 
 	config_gpio_table(camera_off_gpio_table,
@@ -552,7 +555,8 @@
 	int rc = 0;
 
 	if (machine_is_msm7x27a_ffa() || machine_is_msm7625a_ffa()
-				|| machine_is_msm7627a_qrd1())
+				|| machine_is_msm7627a_qrd1()
+				|| machine_is_msm8625_ffa())
 		msm_camera_vreg_config(1);
 
 	rc = config_gpio_table(camera_on_gpio_table,
@@ -569,7 +573,8 @@
 static void config_camera_off_gpios_front(void)
 {
 	if (machine_is_msm7x27a_ffa() || machine_is_msm7625a_ffa()
-				|| machine_is_msm7627a_qrd1())
+				|| machine_is_msm7627a_qrd1()
+				|| machine_is_msm8625_ffa())
 		msm_camera_vreg_config(0);
 
 	config_gpio_table(camera_off_gpio_table,