media: staging: ipu3-imgu: Update firmware path

Use the current firmware path in linux-firmware repository. Check the
older paths still in order to avoid causing issues to the users.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.c b/drivers/staging/media/ipu3/ipu3-css-fw.c
index 2b659b0ccca14d94c645e27344e88a408cbec35f..37482b626c3ce8959aff828df9e2f5b3e1a7afc1 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_20161208, css->dev);
+       r = request_firmware(&css->fw, IMGU_FW_NAME_IPU_20161208, css->dev);
+       if (r == -ENOENT)
+               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)

diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.h b/drivers/staging/media/ipu3/ipu3-css-fw.h
index f9403da75785132bbb3e8c8dbc946d51b7ced6b3..c956aa21df25d1afc7528f3f9712a6a61af7c04a 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-css-fw.h
+++ b/drivers/staging/media/ipu3/ipu3-css-fw.h
@@ -9,6 +9,8 @@
 #define IMGU_FW_NAME           "intel/ipu3-fw.bin"
 #define IMGU_FW_NAME_20161208  \
        "intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"
+#define IMGU_FW_NAME_IPU_20161208      \
+       "intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin"
 
 typedef u32 imgu_fw_ptr;