Commit f99d6757 authored by Hans de Goede's avatar Hans de Goede Committed by Hans Verkuil
Browse files

media: atomisp: Prefix firmware paths with "intel/ipu/" 



The atomisp firmwares have been added to upstream linux-firmware
under intel/ipu/ add this prefix to the firmware name passed
to request_firmware().

Fall back to the old location if this fails to avoid breaking existing
setups.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240603132057.255917-3-hdegoede@redhat.com


Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 19d933cf

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

+6 −3
Original line number Diff line number Diff line
@@ -1099,17 +1099,17 @@ atomisp_load_firmware(struct atomisp_device *isp) 


	if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT) ==

	    ATOMISP_HW_REVISION_ISP2401)

		fw_path = "shisp_2401a0_v21.bin";

		fw_path = "intel/ipu/shisp_2401a0_v21.bin";



	if (isp->media_dev.hw_revision ==

	    ((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT) |

	     ATOMISP_HW_STEPPING_A0))

		fw_path = "shisp_2401a0_legacy_v21.bin";

		fw_path = "intel/ipu/shisp_2401a0_legacy_v21.bin";



	if (isp->media_dev.hw_revision ==

	    ((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT) |

	     ATOMISP_HW_STEPPING_B0))

		fw_path = "shisp_2400b0_v21.bin";

		fw_path = "intel/ipu/shisp_2400b0_v21.bin";



	if (!fw_path) {

		dev_err(isp->dev, "Unsupported hw_revision 0x%x\n",
@@ -1118,6 +1118,9 @@ atomisp_load_firmware(struct atomisp_device *isp) 
	}



	rc = request_firmware(&fw, fw_path, isp->dev);

	/* Fallback to old fw_path without "intel/ipu/" prefix */

	if (rc)

		rc = request_firmware(&fw, kbasename(fw_path), isp->dev);

	if (rc) {

		dev_err(isp->dev,

			"atomisp: Error %d while requesting firmware %s\n",