Merge tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 - Added support for some new video formats
 - mn88473 DVB frontend driver got promoted from staging
 - several improvements at the VSP1 driver
 - several cleanups and improvements at the Media Controller
 - added Media Controller support to snd-usb-audio.  Currently, enabled
   only for au0828-based V4L2/DVB boards
 - Several improvements at nuvoton-cir: it now supports wake up codes
 - Add media controller support to em28xx and saa7134 drivers
 - coda driver now accepts NXP distributed firmware files
 - Some legacy SoC camera drivers will be moving to staging, as they're
   outdated and nobody so far is willing to fix and convert them to use
   the current media framework
 - As usual, lots of cleanups, improvements and new board additions.

* tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (381 commits)
  media: au0828 disable tuner to demod link in au0828_media_device_register()
  [media] touptek: cast char types on %x printk
  [media] touptek: don't DMA at the stack
  [media] mceusb: use %*ph for small buffer dumps
  [media] v4l: exynos4-is: Drop unneeded check when setting up fimc-lite links
  [media] v4l: vsp1: Check if an entity is a subdev with the right function
  [media] hide unused functions for !MEDIA_CONTROLLER
  [media] em28xx: fix Terratec Grabby AC97 codec detection
  [media] media: add prefixes to interface types
  [media] media: rc: nuvoton: switch attribute wakeup_data to text
  [media] v4l2-ioctl: fix YUV422P pixel format description
  [media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
  [media] v4l2-mc.h: fix yet more compiler errors
  [media] staging/media: add missing TODO files
  [media] media.h: always start with 1 for the audio entities
  [media] sound/usb: Use meaninful names for goto labels
  [media] v4l2-mc.h: fix compiler warnings
  [media] media: au0828 audio mixer isn't connected to decoder
  [media] sound/usb: Use Media Controller API to share media resources
  [media] dw2102: add support for TeVii S662
  ...

3 files changed, 85 insertions, 26 deletions

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 38aacc7fc692..b6625047250d 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1342,7 +1342,7 @@ static void coda_finish_encode(struct coda_ctx *ctx)
 
         /* Calculate bytesused field */
         if (dst_buf->sequence == 0) {
-                vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, wr_ptr - start_ptr +
                                         ctx->vpu_header_size[0] +
                                         ctx->vpu_header_size[1] +
                                         ctx->vpu_header_size[2]);
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 2d782ce94a67..133ab9f70f85 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1950,16 +1950,76 @@ static int coda_register_device(struct coda_dev *dev, int i)
         return video_register_device(vfd, VFL_TYPE_GRABBER, 0);
 }
 
+static void coda_copy_firmware(struct coda_dev *dev, const u8 * const buf,
+                               size_t size)
+{
+        u32 *src = (u32 *)buf;
+
+        /* Check if the firmware has a 16-byte Freescale header, skip it */
+        if (buf[0] == 'M' && buf[1] == 'X')
+                src += 4;
+        /*
+         * Check whether the firmware is in native order or pre-reordered for
+         * memory access. The first instruction opcode always is 0xe40e.
+         */
+        if (__le16_to_cpup((__le16 *)src) == 0xe40e) {
+                u32 *dst = dev->codebuf.vaddr;
+                int i;
+
+                /* Firmware in native order, reorder while copying */
+                if (dev->devtype->product == CODA_DX6) {
+                        for (i = 0; i < (size - 16) / 4; i++)
+                                dst[i] = (src[i] << 16) | (src[i] >> 16);
+                } else {
+                        for (i = 0; i < (size - 16) / 4; i += 2) {
+                                dst[i] = (src[i + 1] << 16) | (src[i + 1] >> 16);
+                                dst[i + 1] = (src[i] << 16) | (src[i] >> 16);
+                        }
+                }
+        } else {
+                /* Copy the already reordered firmware image */
+                memcpy(dev->codebuf.vaddr, src, size);
+        }
+}
+
+static void coda_fw_callback(const struct firmware *fw, void *context);
+
+static int coda_firmware_request(struct coda_dev *dev)
+{
+        char *fw = dev->devtype->firmware[dev->firmware];
+
+        dev_dbg(&dev->plat_dev->dev, "requesting firmware '%s' for %s\n", fw,
+                coda_product_name(dev->devtype->product));
+
+        return request_firmware_nowait(THIS_MODULE, true, fw,
+                                       &dev->plat_dev->dev, GFP_KERNEL, dev,
+                                       coda_fw_callback);
+}
+
 static void coda_fw_callback(const struct firmware *fw, void *context)
 {
         struct coda_dev *dev = context;
         struct platform_device *pdev = dev->plat_dev;
         int i, ret;
 
-        if (!fw) {
+        if (!fw && dev->firmware == 1) {
                 v4l2_err(&dev->v4l2_dev, "firmware request failed\n");
                 goto put_pm;
         }
+        if (!fw) {
+                dev->firmware = 1;
+                coda_firmware_request(dev);
+                return;
+        }
+        if (dev->firmware == 1) {
+                /*
+                 * Since we can't suppress warnings for failed asynchronous
+                 * firmware requests, report that the fallback firmware was
+                 * found.
+                 */
+                dev_info(&pdev->dev, "Using fallback firmware %s\n",
+                         dev->devtype->firmware[dev->firmware]);
+        }
 
         /* allocate auxiliary per-device code buffer for the BIT processor */
         ret = coda_alloc_aux_buf(dev, &dev->codebuf, fw->size, "codebuf",
@@ -1967,8 +2027,7 @@ static void coda_fw_callback(const struct firmware *fw, void *context)
         if (ret < 0)
                 goto put_pm;
 
-        /* Copy the whole firmware image to the code buffer */
-        memcpy(dev->codebuf.vaddr, fw->data, fw->size);
+        coda_copy_firmware(dev, fw->data, fw->size);
         release_firmware(fw);
 
         ret = coda_hw_init(dev);
@@ -2019,17 +2078,6 @@ put_pm:
         pm_runtime_put_sync(&pdev->dev);
 }
 
-static int coda_firmware_request(struct coda_dev *dev)
-{
-        char *fw = dev->devtype->firmware;
-
-        dev_dbg(&dev->plat_dev->dev, "requesting firmware '%s' for %s\n", fw,
-                coda_product_name(dev->devtype->product));
-
-        return request_firmware_nowait(THIS_MODULE, true,
-                fw, &dev->plat_dev->dev, GFP_KERNEL, dev, coda_fw_callback);
-}
-
 enum coda_platform {
         CODA_IMX27,
         CODA_IMX53,
@@ -2039,7 +2087,10 @@ enum coda_platform {
 
 static const struct coda_devtype coda_devdata[] = {
         [CODA_IMX27] = {
-                .firmware     = "v4l-codadx6-imx27.bin",
+                .firmware     = {
+                        "vpu_fw_imx27_TO2.bin",
+                        "v4l-codadx6-imx27.bin"
+                },
                 .product      = CODA_DX6,
                 .codecs       = codadx6_codecs,
                 .num_codecs   = ARRAY_SIZE(codadx6_codecs),
@@ -2049,7 +2100,10 @@ static const struct coda_devtype coda_devdata[] = {
                 .iram_size    = 0xb000,
         },
         [CODA_IMX53] = {
-                .firmware     = "v4l-coda7541-imx53.bin",
+                .firmware     = {
+                        "vpu_fw_imx53.bin",
+                        "v4l-coda7541-imx53.bin"
+                },
                 .product      = CODA_7541,
                 .codecs       = coda7_codecs,
                 .num_codecs   = ARRAY_SIZE(coda7_codecs),
@@ -2060,7 +2114,10 @@ static const struct coda_devtype coda_devdata[] = {
                 .iram_size    = 0x14000,
         },
         [CODA_IMX6Q] = {
-                .firmware     = "v4l-coda960-imx6q.bin",
+                .firmware     = {
+                        "vpu_fw_imx6q.bin",
+                        "v4l-coda960-imx6q.bin"
+                },
                 .product      = CODA_960,
                 .codecs       = coda9_codecs,
                 .num_codecs   = ARRAY_SIZE(coda9_codecs),
@@ -2071,7 +2128,10 @@ static const struct coda_devtype coda_devdata[] = {
                 .iram_size    = 0x21000,
         },
         [CODA_IMX6DL] = {
-                .firmware     = "v4l-coda960-imx6dl.bin",
+                .firmware     = {
+                        "vpu_fw_imx6d.bin",
+                        "v4l-coda960-imx6dl.bin"
+                },
                 .product      = CODA_960,
                 .codecs       = coda9_codecs,
                 .num_codecs   = ARRAY_SIZE(coda9_codecs),
@@ -2118,14 +2178,12 @@ static int coda_probe(struct platform_device *pdev)
 
         pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
 
-        if (of_id) {
+        if (of_id)
                 dev->devtype = of_id->data;
-        } else if (pdev_id) {
+        else if (pdev_id)
                 dev->devtype = &coda_devdata[pdev_id->driver_data];
-        } else {
-                ret = -EINVAL;
-                goto err_v4l2_register;
-        }
+        else
+                return -EINVAL;
 
         spin_lock_init(&dev->irqlock);
         INIT_LIST_HEAD(&dev->instances);
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
index d08e9843e9f2..8f2c71e06966 100644
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -50,7 +50,7 @@ enum coda_product {
 struct coda_video_device;
 
 struct coda_devtype {
-        char                    *firmware;
+        char                    *firmware[2];
         enum coda_product       product;
         const struct coda_codec *codecs;
         unsigned int            num_codecs;
@@ -74,6 +74,7 @@ struct coda_dev {
         struct video_device     vfd[5];
         struct platform_device  *plat_dev;
         const struct coda_devtype *devtype;
+        int                     firmware;
 
         void __iomem            *regs_base;
         struct clk              *clk_per;