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-msm7627a-camera.c b/arch/arm/mach-msm/board-msm7627a-camera.c
index 12cd5af..f7333b9 100644
--- a/arch/arm/mach-msm/board-msm7627a-camera.c
+++ b/arch/arm/mach-msm/board-msm7627a-camera.c
@@ -114,18 +114,17 @@
.is_csic = 1,
};
-#ifdef CONFIG_DW9712_ACT
-static struct i2c_board_info s5k4e1_actuator_i2c_info = {
- I2C_BOARD_INFO("dw9712_act", 0x8C >> 1),
+static struct i2c_board_info msm_act_main_cam_i2c_info = {
+ I2C_BOARD_INFO("msm_actuator", 0x11),
};
-static struct msm_actuator_info s5k4e1_actuator_info = {
- .board_info = &s5k4e1_actuator_i2c_info,
+static struct msm_actuator_info msm_act_main_cam_4_info = {
+ .board_info = &msm_act_main_cam_i2c_info,
+ .cam_name = MSM_ACTUATOR_MAIN_CAM_4,
.bus_id = MSM_GSBI0_QUP_I2C_BUS_ID,
.vcm_pwd = GPIO_CAM_GP_CAM_PWDN,
.vcm_enable = 1,
};
-#endif
#ifdef CONFIG_S5K4E1
static struct msm_camera_sensor_flash_data flash_s5k4e1 = {
@@ -150,9 +149,7 @@
.csi_if = 1,
.camera_type = BACK_CAMERA_2D,
.sensor_type = BAYER_SENSOR,
-#ifdef CONFIG_DW9712_ACT
- .actuator_info = &s5k4e1_actuator_info
-#endif
+ .actuator_info = &msm_act_main_cam_4_info,
};
#endif
@@ -185,18 +182,13 @@
#ifdef CONFIG_OV5647
-#ifdef CONFIG_AD5046_ACT
-static struct i2c_board_info ad5046_actuator_i2c_info = {
- I2C_BOARD_INFO("ad5046_act", 0x18 >> 1),
-};
-
-static struct msm_actuator_info ad5046_actuator_info = {
- .board_info = &ad5046_actuator_i2c_info,
+static struct msm_actuator_info msm_act_main_cam_5_info = {
+ .board_info = &msm_act_main_cam_i2c_info,
+ .cam_name = MSM_ACTUATOR_MAIN_CAM_5,
.bus_id = MSM_GSBI0_QUP_I2C_BUS_ID,
.vcm_pwd = GPIO_SKU3_CAM_5MP_CAM_DRIVER_PWDN,
.vcm_enable = 1,
};
-#endif
static struct msm_camera_sensor_platform_info sensor_board_info_ov5647 = {
.mount_angle = 90,
@@ -228,10 +220,7 @@
.csi_if = 1,
.camera_type = BACK_CAMERA_2D,
.sensor_type = BAYER_SENSOR,
-
-#ifdef CONFIG_AD5046_ACT
- .actuator_info = &ad5046_actuator_info
-#endif
+ .actuator_info = &msm_act_main_cam_5_info,
};
#endif