From 9d023ce9770533f0dd2fb0cbb8d435f1c851f443 Mon Sep 17 00:00:00 2001 From: wangshuo18 Date: Wed, 7 Apr 2021 15:47:20 +0800 Subject: [PATCH] cam: add macro CONFIG_AF_NOISE_ELIMINATION judgment -fix build error -only integrate mot_actuator driver on device which enabled CONFIG_AF_NOISE_ELIMINATION -modify dac_pos to 480,follow hanoip Change-Id: I7205cd01df239ede3c7a54609d4c8eb54f42eb87 Signed-off-by: wangshuo18 Reviewed-on: https://gerrit.mot.com/1918702 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Shuo Wang Reviewed-by: Dawei Wang Reviewed-by: Bolei Shang Reviewed-by: Ji Zhao Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- drivers/cam_sensor_module/cam_actuator/mot_actuator.c | 2 +- drivers/camera_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/cam_sensor_module/cam_actuator/mot_actuator.c b/drivers/cam_sensor_module/cam_actuator/mot_actuator.c index e8fe296ca82d..03d2bd9f3591 100644 --- a/drivers/cam_sensor_module/cam_actuator/mot_actuator.c +++ b/drivers/cam_sensor_module/cam_actuator/mot_actuator.c @@ -197,7 +197,7 @@ static const mot_dev_info mot_dev_list[MOT_DEVICE_NUM] = { .actuator_info = { [0] = { .actuator_type = MOT_ACTUATOR_DW9714, - .dac_pos = 400, + .dac_pos = 480, .cci_addr = 0x0c, .cci_dev = 0x01, .cci_master = 0x01, diff --git a/drivers/camera_main.c b/drivers/camera_main.c index 4e838c377473..d126491e8d28 100644 --- a/drivers/camera_main.c +++ b/drivers/camera_main.c @@ -20,7 +20,9 @@ #include "cam_cci_dev.h" #include "cam_sensor_dev.h" #include "cam_actuator_dev.h" +#ifdef CONFIG_AF_NOISE_ELIMINATION #include "mot_actuator.h" +#endif #include "cam_csiphy_dev.h" #include "cam_eeprom_dev.h" #include "cam_ois_dev.h" @@ -106,7 +108,9 @@ static const struct camera_submodule_component camera_sensor[] = { {&cam_cci_init_module, &cam_cci_exit_module}, {&cam_csiphy_init_module, &cam_csiphy_exit_module}, {&cam_actuator_driver_init, &cam_actuator_driver_exit}, +#ifdef CONFIG_AF_NOISE_ELIMINATION {&mot_actuator_driver_init, &mot_actuator_driver_exit}, +#endif {&cam_sensor_driver_init, &cam_sensor_driver_exit}, {&cam_eeprom_driver_init, &cam_eeprom_driver_exit}, {&cam_ois_driver_init, &cam_ois_driver_exit},