Merge "msm: camera: icp: Fetch the firmware name from soc info" into camera-kernel.lnx.4.0 (cfad27ef) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_icp/icp_hw/a5_hw/a5_core.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -199,11 +199,23 @@ 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 (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) {
		CAM_ERR(CAM_ICP, "Invalid elf size");

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −1