A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: icp: Fetch the firmware name from soc info" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-12-10 11:01:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit cfad27efa7
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/cam_icp/icp_hw/a5_hw/a5_core.c
View file

@ -199,10 +199,22 @@ static int32_t cam_a5_download_fw(void *device_priv)
pdev = soc_info->pdev;
cam_a5_soc_info = soc_info->soc_private;
rc = request_firmware(&core_info->fw_elf, "CAMERA_ICP.elf", &pdev->dev);
if (rc) {
CAM_ERR(CAM_ICP, "Failed to locate fw: %d", rc);
return rc;
if (cam_a5_soc_info->fw_name) {
CAM_INFO(CAM_ICP, "Downloading firmware %s",
cam_a5_soc_info->fw_name);
rc = request_firmware(&core_info->fw_elf,
cam_a5_soc_info->fw_name, &pdev->dev);
if (rc) {
CAM_ERR(CAM_ICP, "Failed to locate fw: %d", rc);
return rc;
}
} else {
rc = request_firmware(&core_info->fw_elf,
"CAMERA_ICP.elf", &pdev->dev);
if (rc) {
CAM_ERR(CAM_ICP, "Failed to locate fw: %d", rc);
return rc;
}
}
if (!core_info->fw_elf) {

3
drivers/cam_icp/icp_hw/a5_hw/a5_soc.c
View file

@ -32,7 +32,6 @@ static int cam_a5_get_dt_properties(struct cam_hw_soc_info *soc_info)
}
a5_soc_info = soc_info->soc_private;
fw_name = a5_soc_info->fw_name;
rc = of_property_read_string(of_node, "fw_name", &fw_name);
if (rc < 0) {
@ -40,6 +39,8 @@ static int cam_a5_get_dt_properties(struct cam_hw_soc_info *soc_info)
goto end;
}
a5_soc_info->fw_name = fw_name;
rc = of_property_read_u32(of_node, "qos-val",
&a5_soc_info->a5_qos_val);
if (rc < 0) {

2
drivers/cam_icp/icp_hw/a5_hw/a5_soc.h
View file

@ -18,7 +18,7 @@ struct a5_ubwc_cfg_ext {
};
struct a5_soc_info {
char *fw_name;
const char *fw_name;
bool ubwc_config_ext;
uint32_t a5_qos_val;
union {