Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - Some cleanups at V4L2 documentation

 - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
   sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
   driver

 - Lots of missing MAINTAINERS entries added

 - several em28xx driver improvements, including its conversion to
   videobuf2

 - several fixups on drivers to make them to better comply with the API

 - DVB core: add support for DVBv5 stats, allowing the implementation of
   statistics for new standards like ISDB

 - mb86a20s: add statistics to the driver

 - lots of new board additions, cleanups, and driver improvements.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
  [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
  [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
  [media] em28xx: add usb id for terratec h5 rev. 3
  [media] media: rc: gpio-ir-recv: add support for device tree parsing
  [media] mceusb: move check earlier to make smatch happy
  [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
  [media] staging: media: Remove unnecessary OOM messages
  [media] sh_vou: Use vou_dev instead of vou_file wherever possible
  [media] sh_vou: Use video_drvdata()
  [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
  [media] mt9t112: mt9t111 format set up differs from mt9t112
  [media] sh-mobile-ceu-camera: fix SHARPNESS control default
  Revert "[media] fc0011: Return early, if the frequency is already tuned"
  [media] cx18/ivtv: fix regression: remove __init from a non-init function
  [media] em28xx: fix analog streaming with USB bulk transfers
  [media] stv0900: remove unnecessary null pointer check
  [media] fc0011: Return early, if the frequency is already tuned
  [media] fc0011: Add some sanity checks and cleanups
  [media] fc0011: Fix xin value clamping
  Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
  ...

1 files changed, 31 insertions, 4 deletions

diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 6ed259fb1046..aaaf276a5a6c 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -604,8 +604,13 @@ static void device_run(void *prv)
         g2d_set_flip(dev, ctx->flip);
 
         if (ctx->in.c_width != ctx->out.c_width ||
-                ctx->in.c_height != ctx->out.c_height)
-                cmd |= g2d_cmd_stretch(1);
+                ctx->in.c_height != ctx->out.c_height) {
+                if (dev->variant->hw_rev == TYPE_G2D_3X)
+                        cmd |= CMD_V3_ENABLE_STRETCH;
+                else
+                        g2d_set_v41_stretch(dev, &ctx->in, &ctx->out);
+        }
+
         g2d_set_cmd(dev, cmd);
         g2d_start(dev);
 
@@ -713,7 +718,7 @@ static int g2d_probe(struct platform_device *pdev)
                 return PTR_ERR(dev->regs);
 
         dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
-        if (IS_ERR_OR_NULL(dev->clk)) {
+        if (IS_ERR(dev->clk)) {
                 dev_err(&pdev->dev, "failed to get g2d clock\n");
                 return -ENXIO;
         }
@@ -725,7 +730,7 @@ static int g2d_probe(struct platform_device *pdev)
         }
 
         dev->gate = clk_get(&pdev->dev, "fimg2d");
-        if (IS_ERR_OR_NULL(dev->gate)) {
+        if (IS_ERR(dev->gate)) {
                 dev_err(&pdev->dev, "failed to get g2d clock gate\n");
                 ret = -ENXIO;
                 goto unprep_clk;
@@ -789,6 +794,7 @@ static int g2d_probe(struct platform_device *pdev)
         }
 
         def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;
+        dev->variant = g2d_get_drv_data(pdev);
 
         return 0;
 
@@ -828,9 +834,30 @@ static int g2d_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct g2d_variant g2d_drvdata_v3x = {
+        .hw_rev = TYPE_G2D_3X,
+};
+
+static struct g2d_variant g2d_drvdata_v4x = {
+        .hw_rev = TYPE_G2D_4X, /* Revision 4.1 for Exynos4X12 and Exynos5 */
+};
+
+static struct platform_device_id g2d_driver_ids[] = {
+        {
+                .name = "s5p-g2d",
+                .driver_data = (unsigned long)&g2d_drvdata_v3x,
+        }, {
+                .name = "s5p-g2d-v4x",
+                .driver_data = (unsigned long)&g2d_drvdata_v4x,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(platform, g2d_driver_ids);
+
 static struct platform_driver g2d_pdrv = {
         .probe          = g2d_probe,
         .remove         = g2d_remove,
+        .id_table       = g2d_driver_ids,
         .driver         = {
                 .name = G2D_NAME,
                 .owner = THIS_MODULE,