Commit 229fac6c authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: staging: media: ipu3-imgu: Request specific firmware binary

Primarily request a specific revision of the IPU3 firmware that the driver
is known to work with,
irci_irci_ecr-master_20161208_0213_20170112_1500.bin. Some distros only
ship this while others provide a symlink called ipu3-fw.bin, which the
driver only requested previously.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 2425c81f
...@@ -117,6 +117,8 @@ int imgu_css_fw_init(struct imgu_css *css) ...@@ -117,6 +117,8 @@ int imgu_css_fw_init(struct imgu_css *css)
unsigned int i, j, binary_nr; unsigned int i, j, binary_nr;
int r; int r;
r = request_firmware(&css->fw, IMGU_FW_NAME_20161208, css->dev);
if (r == -ENOENT)
r = request_firmware(&css->fw, IMGU_FW_NAME, css->dev); r = request_firmware(&css->fw, IMGU_FW_NAME, css->dev);
if (r) if (r)
return r; return r;
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
/******************* Firmware file definitions *******************/ /******************* Firmware file definitions *******************/
#define IMGU_FW_NAME "intel/ipu3-fw.bin" #define IMGU_FW_NAME "intel/ipu3-fw.bin"
#define IMGU_FW_NAME_20161208 \
"intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"
typedef u32 imgu_fw_ptr; typedef u32 imgu_fw_ptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment