msm: camera: 8960: Unify Autofocus actuator

The actuator functionality is the same for different camera
modules. So a single actuator driver module is supported.
The variation is because of actuator control parameters,
which are made available in user space actuator driver
for better integration with tools used for autofocus
tuning.

Change-Id: Ibbae2ef426b570c59ec3796ac56abcf05af28259
Signed-off-by: Rajakumar Govindaram <rajakuma@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930-camera.c b/arch/arm/mach-msm/board-8930-camera.c
index 92e88aa72..12312ee 100644
--- a/arch/arm/mach-msm/board-8930-camera.c
+++ b/arch/arm/mach-msm/board-8930-camera.c
@@ -407,15 +407,16 @@
 	.cam_gpio_set_tbl_size = ARRAY_SIZE(msm8930_back_cam_gpio_set_tbl),
 };
 
-static struct i2c_board_info imx074_actuator_i2c_info = {
-	I2C_BOARD_INFO("imx074_act", 0x11),
+static struct i2c_board_info msm_act_main_cam_i2c_info = {
+	I2C_BOARD_INFO("msm_actuator", 0x11),
 };
 
-static struct msm_actuator_info imx074_actuator_info = {
-	.board_info     = &imx074_actuator_i2c_info,
+static struct msm_actuator_info msm_act_main_cam_0_info = {
+	.board_info     = &msm_act_main_cam_i2c_info,
+	.cam_name   = MSM_ACTUATOR_MAIN_CAM_0,
 	.bus_id         = MSM_8930_GSBI4_QUP_I2C_BUS_ID,
 	.vcm_pwd        = 0,
-	.vcm_enable     = 1,
+	.vcm_enable     = 0,
 };
 
 static struct msm_camera_sensor_flash_data flash_imx074 = {
@@ -447,7 +448,7 @@
 	.csi_if	= 1,
 	.camera_type = BACK_CAMERA_2D,
 	.sensor_type = BAYER_SENSOR,
-	.actuator_info = &imx074_actuator_info
+	.actuator_info = &msm_act_main_cam_0_info,
 };
 
 static struct camera_vreg_t msm_8930_mt9m114_vreg[] = {