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

Pull media updates from Mauro Carvalho Chehab:

 - new CEC pin injection code for testing purposes

 - DVB frontend cxd2099 promoted from staging

 - new platform driver for Sony cxd2880 DVB devices

 - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
   tw9910.c

 - removal of unused cx18 and ivtv alsa mixers

 - the reneseas-ceu driver doesn't depend on soc_camera anymore and
   moved from staging

 - removed the mantis_vp3028 driver, unused since 2009

 - s5p-mfc: add support for version 10 of the MSP

 - added a decoder for imon protocol

 - atomisp: lots of cleanups

 - imx074 and mt9t031: don't depend on soc_camera anymore, being
   promoted from staging

 - added helper functions to better support DVB I2C binding

 - lots of driver improvements and cleanups

* tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
  media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
  media: fimc-capture: get rid of two warnings
  media: dvb-usb-v2: fix a missing dependency of I2C_MUX
  media: uvc: to the right check at uvc_ioctl_enum_framesizes()
  media: cec-core: fix a bug at cec_error_inj_write()
  media: tda9840: cleanup a warning
  media: tm6000:  avoid casting just to print pointer address
  media: em28xx-input: improve error handling code
  media: zr364xx: avoid casting just to print pointer address
  media: vivid-radio-rx: add a cast to avoid a warning
  media: saa7134-alsa: don't use casts to print a buffer address
  media: solo6x10: get rid of an address space warning
  media: zoran: don't cast pointers to print them
  media: ir-kbd-i2c: change the if logic to avoid a warning
  media: ir-kbd-i2c: improve error handling code
  media: saa7134-input: improve error handling
  media: s2255drv: fix a casting warning
  media: ivtvfb: Cleanup some warnings
  media: videobuf-dma-sg: Fix a weird cast
  soc_camera: fix a weird cast on printk
  ...

1 files changed, 40 insertions, 4 deletions

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index e8a7554a61d2..04e35d70ce2e 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -128,7 +128,8 @@ void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
 /*
  * Arrays of codecs supported by each given version of Coda:
  *  i.MX27 -> codadx6
- *  i.MX5x -> coda7
+ *  i.MX51 -> codahx4
+ *  i.MX53 -> coda7
  *  i.MX6  -> coda960
  * Use V4L2_PIX_FMT_YUV420 as placeholder for all supported YUV 4:2:0 variants
  */
@@ -137,6 +138,13 @@ static const struct coda_codec codadx6_codecs[] = {
         CODA_CODEC(CODADX6_MODE_ENCODE_MP4,  V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 720, 576),
 };
 
+static const struct coda_codec codahx4_codecs[] = {
+        CODA_CODEC(CODA7_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264,   720, 576),
+        CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264,   V4L2_PIX_FMT_YUV420, 1920, 1088),
+        CODA_CODEC(CODA7_MODE_DECODE_MP2,  V4L2_PIX_FMT_MPEG2,  V4L2_PIX_FMT_YUV420, 1920, 1088),
+        CODA_CODEC(CODA7_MODE_DECODE_MP4,  V4L2_PIX_FMT_MPEG4,  V4L2_PIX_FMT_YUV420, 1280, 720),
+};
+
 static const struct coda_codec coda7_codecs[] = {
         CODA_CODEC(CODA7_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264,   1280, 720),
         CODA_CODEC(CODA7_MODE_ENCODE_MP4,  V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4,  1280, 720),
@@ -234,6 +242,11 @@ static const struct coda_video_device *codadx6_video_devices[] = {
         &coda_bit_encoder,
 };
 
+static const struct coda_video_device *codahx4_video_devices[] = {
+        &coda_bit_encoder,
+        &coda_bit_decoder,
+};
+
 static const struct coda_video_device *coda7_video_devices[] = {
         &coda_bit_jpeg_encoder,
         &coda_bit_jpeg_decoder,
@@ -332,6 +345,8 @@ const char *coda_product_name(int product)
         switch (product) {
         case CODA_DX6:
                 return "CodaDx6";
+        case CODA_HX4:
+                return "CodaHx4";
         case CODA_7541:
                 return "CODA7541";
         case CODA_960:
@@ -1775,7 +1790,8 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
                 V4L2_CID_MPEG_VIDEO_H264_PROFILE,
                 V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
                 V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE);
-        if (ctx->dev->devtype->product == CODA_7541) {
+        if (ctx->dev->devtype->product == CODA_HX4 ||
+            ctx->dev->devtype->product == CODA_7541) {
                 v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
                         V4L2_CID_MPEG_VIDEO_H264_LEVEL,
                         V4L2_MPEG_VIDEO_H264_LEVEL_3_1,
@@ -1803,7 +1819,8 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
                 V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE,
                 V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE, 0x0,
                 V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE);
-        if (ctx->dev->devtype->product == CODA_7541 ||
+        if (ctx->dev->devtype->product == CODA_HX4 ||
+            ctx->dev->devtype->product == CODA_7541 ||
             ctx->dev->devtype->product == CODA_960) {
                 v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
                         V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -2004,6 +2021,7 @@ static int coda_open(struct file *file)
                 if (enable_bwb || ctx->inst_type == CODA_INST_ENCODER)
                         ctx->frame_mem_ctrl = CODA9_FRAME_ENABLE_BWB;
                 /* fallthrough */
+        case CODA_HX4:
         case CODA_7541:
                 ctx->reg_idx = 0;
                 break;
@@ -2182,7 +2200,8 @@ static int coda_hw_init(struct coda_dev *dev)
 
         /* Tell the BIT where to find everything it needs */
         if (dev->devtype->product == CODA_960 ||
-            dev->devtype->product == CODA_7541) {
+            dev->devtype->product == CODA_7541 ||
+            dev->devtype->product == CODA_HX4) {
                 coda_write(dev, dev->tempbuf.paddr,
                                 CODA_REG_BIT_TEMP_BUF_ADDR);
                 coda_write(dev, 0, CODA_REG_BIT_BIT_STREAM_PARAM);
@@ -2387,6 +2406,7 @@ put_pm:
 
 enum coda_platform {
         CODA_IMX27,
+        CODA_IMX51,
         CODA_IMX53,
         CODA_IMX6Q,
         CODA_IMX6DL,
@@ -2407,6 +2427,21 @@ static const struct coda_devtype coda_devdata[] = {
                 .workbuf_size = 288 * 1024 + FMO_SLICE_SAVE_BUF_SIZE * 8 * 1024,
                 .iram_size    = 0xb000,
         },
+        [CODA_IMX51] = {
+                .firmware     = {
+                        "vpu_fw_imx51.bin",
+                        "vpu/vpu_fw_imx51.bin",
+                        "v4l-codahx4-imx51.bin"
+                },
+                .product      = CODA_HX4,
+                .codecs       = codahx4_codecs,
+                .num_codecs   = ARRAY_SIZE(codahx4_codecs),
+                .vdevs        = codahx4_video_devices,
+                .num_vdevs    = ARRAY_SIZE(codahx4_video_devices),
+                .workbuf_size = 128 * 1024,
+                .tempbuf_size = 304 * 1024,
+                .iram_size    = 0x14000,
+        },
         [CODA_IMX53] = {
                 .firmware     = {
                         "vpu_fw_imx53.bin",
@@ -2463,6 +2498,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids);
 #ifdef CONFIG_OF
 static const struct of_device_id coda_dt_ids[] = {
         { .compatible = "fsl,imx27-vpu", .data = &coda_devdata[CODA_IMX27] },
+        { .compatible = "fsl,imx51-vpu", .data = &coda_devdata[CODA_IMX51] },
         { .compatible = "fsl,imx53-vpu", .data = &coda_devdata[CODA_IMX53] },
         { .compatible = "fsl,imx6q-vpu", .data = &coda_devdata[CODA_IMX6Q] },
         { .compatible = "fsl,imx6dl-vpu", .data = &coda_devdata[CODA_IMX6DL] },