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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.c b/drivers/staging/media/ipu3/ipu3-css-fw.c
index 981693eed81551f0246eeb80caf14739ddc631e4..2b659b0ccca14d94c645e27344e88a408cbec35f 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-css-fw.c
+++ b/drivers/staging/media/ipu3/ipu3-css-fw.c
@@ -117,7 +117,9 @@ int imgu_css_fw_init(struct imgu_css *css)
        unsigned int i, j, binary_nr;
        int r;
 
-       r = request_firmware(&css->fw, IMGU_FW_NAME, css->dev);
+       r = request_firmware(&css->fw, IMGU_FW_NAME_20161208, css->dev);
+       if (r == -ENOENT)
+               r = request_firmware(&css->fw, IMGU_FW_NAME, css->dev);
        if (r)
                return r;
 

diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.h b/drivers/staging/media/ipu3/ipu3-css-fw.h
index c0bc57fd678a788ab54897ddc97b2cfc2c73e3fe..f9403da75785132bbb3e8c8dbc946d51b7ced6b3 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-css-fw.h
+++ b/drivers/staging/media/ipu3/ipu3-css-fw.h
@@ -6,7 +6,9 @@
 
 /******************* 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;