tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20240603132057.255917-3-hdegoede@redhat.com
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Hans de Goede and committed by
Hans Verkuil f99d6757 19d933cf

+6 -3
+6 -3
drivers/staging/media/atomisp/pci/atomisp_v4l2.c
··· 1099 1099 1100 1100 if ((isp->media_dev.hw_revision >> ATOMISP_HW_REVISION_SHIFT) == 1101 1101 ATOMISP_HW_REVISION_ISP2401) 1102 - fw_path = "shisp_2401a0_v21.bin"; 1102 + fw_path = "intel/ipu/shisp_2401a0_v21.bin"; 1103 1103 1104 1104 if (isp->media_dev.hw_revision == 1105 1105 ((ATOMISP_HW_REVISION_ISP2401_LEGACY << ATOMISP_HW_REVISION_SHIFT) | 1106 1106 ATOMISP_HW_STEPPING_A0)) 1107 - fw_path = "shisp_2401a0_legacy_v21.bin"; 1107 + fw_path = "intel/ipu/shisp_2401a0_legacy_v21.bin"; 1108 1108 1109 1109 if (isp->media_dev.hw_revision == 1110 1110 ((ATOMISP_HW_REVISION_ISP2400 << ATOMISP_HW_REVISION_SHIFT) | 1111 1111 ATOMISP_HW_STEPPING_B0)) 1112 - fw_path = "shisp_2400b0_v21.bin"; 1112 + fw_path = "intel/ipu/shisp_2400b0_v21.bin"; 1113 1113 1114 1114 if (!fw_path) { 1115 1115 dev_err(isp->dev, "Unsupported hw_revision 0x%x\n", ··· 1118 1118 } 1119 1119 1120 1120 rc = request_firmware(&fw, fw_path, isp->dev); 1121 + /* Fallback to old fw_path without "intel/ipu/" prefix */ 1122 + if (rc) 1123 + rc = request_firmware(&fw, kbasename(fw_path), isp->dev); 1121 1124 if (rc) { 1122 1125 dev_err(isp->dev, 1123 1126 "atomisp: Error %d while requesting firmware %s\n",