samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: sensor: enable the compilation for flash" into camera-kernel.lnx.6.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-12-22 14:42:33 -08:00
committed by Gerrit - the friendly Code Review server
parent 74fb569f3c 425e0a8142
commit d123d73bc2
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/cam_sensor_module/cam_flash/cam_flash_core.c
View File

@@ -1645,13 +1645,18 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
}
flash_query_info =
(struct cam_flash_query_curr *)cmd_buf;
#if __or(IS_REACHABLE(CONFIG_LEDS_QPNP_FLASH_V2), \
IS_REACHABLE(CONFIG_LEDS_QTI_FLASH))
rc = cam_flash_led_prepare(fctrl->switch_trigger,
QUERY_MAX_AVAIL_CURRENT, &query_curr_ma,
soc_private->is_wled_flash);
CAM_DBG(CAM_FLASH, "query_curr_ma = %d",
query_curr_ma);
#else
rc = -EOPNOTSUPP;
#endif
if (rc) {
CAM_ERR(CAM_FLASH,
"Query current failed with rc=%d", rc);

6
drivers/cam_sensor_module/cam_flash/cam_flash_soc.c
View File

@@ -59,6 +59,8 @@ void cam_flash_put_source_node_data(struct cam_flash_ctrl *fctrl)
}
}
#if __or(IS_REACHABLE(CONFIG_LEDS_QPNP_FLASH_V2), \
IS_REACHABLE(CONFIG_LEDS_QTI_FLASH))
static int32_t cam_get_source_node_info(
struct device_node *of_node,
struct cam_flash_ctrl *fctrl,
@@ -267,6 +269,7 @@ static int32_t cam_get_source_node_info(
return rc;
}
#endif
int cam_flash_get_dt_data(struct cam_flash_ctrl *fctrl,
struct cam_hw_soc_info *soc_info)
@@ -300,12 +303,15 @@ int cam_flash_get_dt_data(struct cam_flash_ctrl *fctrl,
goto free_soc_private;
}
#if __or(IS_ENABLED(CONFIG_LEDS_QPNP_FLASH_V2), \
IS_ENABLED(CONFIG_LEDS_QTI_FLASH))
rc = cam_get_source_node_info(of_node, fctrl, soc_info->soc_private);
if (rc) {
CAM_ERR(CAM_FLASH,
"cam_flash_get_pmic_source_info failed rc %d", rc);
goto free_soc_private;
}
#endif
return rc;
free_soc_private: