From d3c34abf724a4dbdc7d2a676ccb5586683ee7c2e Mon Sep 17 00:00:00 2001 From: "tin_yingying.zhang_tmp" Date: Thu, 4 May 2023 21:15:18 +0800 Subject: [PATCH] bangkk: Open Camera preview will be black then camera error details: Solve open main camera error. Change-Id: I20a6a743ce921be683c296d97a4cb0282c9e0542 Signed-off-by: tin_yingying.zhang_tmp Reviewed-on: https://gerrit.mot.com/2596467 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Yongqin Wan Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- drivers/cam_sensor_module/cam_flash/cam_flash_core.c | 6 +++--- drivers/cam_sensor_module/cam_flash/cam_flash_dev.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_core.c b/drivers/cam_sensor_module/cam_flash/cam_flash_core.c index 17359fd2c8d3..fe1e40144965 100644 --- a/drivers/cam_sensor_module/cam_flash/cam_flash_core.c +++ b/drivers/cam_sensor_module/cam_flash/cam_flash_core.c @@ -2152,9 +2152,9 @@ static int cam_flash_construct_power_vio_setting( power_info->power_down_setting[0].seq_type = SENSOR_CUSTOM_GPIO1; power_info->power_down_setting[0].seq_val = 0; power_info->power_down_setting[0].config_val = 0; - power_info->power_down_setting[0].seq_type = SENSOR_VIO; - power_info->power_down_setting[0].seq_val = CAM_VIO; - power_info->power_down_setting[0].config_val = 0; + power_info->power_down_setting[1].seq_type = SENSOR_VIO; + power_info->power_down_setting[1].seq_val = CAM_VIO; + power_info->power_down_setting[1].config_val = 0; return rc; diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.c b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.c index db810e8f5484..80d2bd4382dd 100644 --- a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.c +++ b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.c @@ -172,14 +172,14 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl, CAM_ERR(CAM_FLASH, "Flash Fill Vreg Failed"); goto release_mutex; } + if (cam_flash_fill_i2c_default_setting(fctrl, flash_iic_supplier[0])){ + CAM_ERR(CAM_FLASH, "Failed Flash Fill I2C Setting rc =%d",rc); + goto release_mutex; + } if (fctrl->func_tbl.power_ops(fctrl, true)){ CAM_ERR(CAM_FLASH, "Power Up Failed"); goto release_mutex; } - /*if (cam_flash_fill_i2c_default_setting(fctrl, flash_iic_supplier[0])){ - CAM_ERR(CAM_FLASH, "Failed Flash Fill I2C Setting rc =%d",rc); - goto release_mutex; - }*/ rc = camera_io_dev_read(&(fctrl->io_master_info), flash_iic_supplier[1],&flashid, CAMERA_SENSOR_I2C_TYPE_BYTE,