msm: camera: sensor: enable the compilation for flash

This change enables the compilation for flash even
though there is no pmic flash support, since the i2c
flash still needs the flash framework.

CRs-Fixed: 3095773
Change-Id: I220a38dce1cbc829e446a65c61b7b7eb6b3a1c5b
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
This commit is contained in:
Depeng Shao
2021-12-16 22:34:49 +08:00
committed by Gerrit - the friendly Code Review server
부모 927b715d57
커밋 425e0a8142
4개의 변경된 파일13개의 추가작업 그리고 16개의 파일을 삭제

파일 보기

@@ -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);

파일 보기

@@ -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: