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:
 "The main set of series of patches for media subsystem, including:
   - document RC sysfs class
   - added an API to setup scancode to allow waking up systems using the
     Remote Controller
   - add API for SDR devices.  Drivers are still on staging
   - some API improvements for getting EDID data from media
     inputs/outputs
   - new DVB frontend driver for drx-j (ATSC)
   - one driver (it913x/it9137) got removed, in favor of an improvement
     on another driver (af9035)
   - added a skeleton V4L2 PCI driver at documentation
   - added a dual flash driver (lm3646)
   - added a new IR driver (img-ir)
   - added an IR scancode decoder for the Sharp protocol
   - some improvements at the usbtv driver, to allow its core to be
     reused.
   - added a new SDR driver (rtl2832u_sdr)
   - added a new tuner driver (msi001)
   - several improvements at em28xx driver to fix PM support, device
     removal and to split the V4L2 specific bits into a separate
     sub-driver
   - one driver got converted to videobuf2 (s2255drv)
   - the e4000 tuner driver now follows an improved binding model
   - some fixes at V4L2 compat32 code
   - several fixes and enhancements at videobuf2 code
   - some cleanups at V4L2 API documentation
   - usual driver enhancements, new board additions and misc fixups"

[ NOTE! This merge effective drops commit 4329b93b283c ("of: Reduce
  indentation in of_graph_get_next_endpoint").

  The of_graph_get_next_endpoint() function was moved and renamed by
  commit fd9fdb78a9bf ("[media] of: move graph helpers from
  drivers/media/v4l2-core to drivers/of").  It was originally called
  v4l2_of_get_next_endpoint() and lived in the file
  drivers/media/v4l2-core/v4l2-of.c.

  In that original location, it was then fixed to support empty port
  nodes by commit b9db140c1e46 ("[media] v4l: of: Support empty port
  nodes"), and that commit clashes badly with the dropped "Reduce
  intendation" commit.  I had to choose one or the other, and decided
  that the "Support empty port nodes" commit was more important ]

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits)
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
  [media] em28xx: fix PCTV 290e LNA oops
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  [media] m88ds3103: fix bug on .set_tone()
  [media] saa7134: fix WARN_ON during resume
  [media] v4l2-dv-timings: add module name, description, license
  [media] videodev2.h: add parenthesis around macro arguments
  [media] saa6752hs: depends on CRC32
  [media] si4713: fix Kconfig dependencies
  [media] Sensoray 2255 uses videobuf2
  [media] adv7180: free an interrupt on failure paths in init_device()
  [media] e4000: make VIDEO_V4L2 dependency optional
  [media] af9033: Don't export functions for the hardware filter
  [media] af9035: use af9033 PID filters
  [media] af9033: implement PID filter
  [media] rtl2832_sdr: do not use dynamic stack allocation
  [media] e4000: fix 32-bit build error
  [media] em28xx-audio: make sure audio is unmuted on open()
  [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
  ...

1 files changed, 77 insertions, 14 deletions

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 707aef705a47..d9113cc71c77 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -152,6 +152,7 @@ const char *v4l2_type_names[] = {
         [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "vid-out-overlay",
         [V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE] = "vid-cap-mplane",
         [V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE] = "vid-out-mplane",
+        [V4L2_BUF_TYPE_SDR_CAPTURE]        = "sdr-cap",
 };
 EXPORT_SYMBOL(v4l2_type_names);
 
@@ -245,6 +246,7 @@ static void v4l_print_format(const void *arg, bool write_only)
         const struct v4l2_vbi_format *vbi;
         const struct v4l2_sliced_vbi_format *sliced;
         const struct v4l2_window *win;
+        const struct v4l2_sdr_format *sdr;
         unsigned i;
 
         pr_cont("type=%s", prt_names(p->type, v4l2_type_names));
@@ -318,6 +320,14 @@ static void v4l_print_format(const void *arg, bool write_only)
                                 sliced->service_lines[0][i],
                                 sliced->service_lines[1][i]);
                 break;
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                sdr = &p->fmt.sdr;
+                pr_cont(", pixelformat=%c%c%c%c\n",
+                        (sdr->pixelformat >>  0) & 0xff,
+                        (sdr->pixelformat >>  8) & 0xff,
+                        (sdr->pixelformat >> 16) & 0xff,
+                        (sdr->pixelformat >> 24) & 0xff);
+                break;
         }
 }
 
@@ -834,6 +844,14 @@ static void v4l_print_freq_band(const void *arg, bool write_only)
                         p->rangehigh, p->modulation);
 }
 
+static void v4l_print_edid(const void *arg, bool write_only)
+{
+        const struct v4l2_edid *p = arg;
+
+        pr_cont("pad=%u, start_block=%u, blocks=%u\n",
+                p->pad, p->start_block, p->blocks);
+}
+
 static void v4l_print_u32(const void *arg, bool write_only)
 {
         pr_cont("value=%u\n", *(const u32 *)arg);
@@ -881,6 +899,7 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
         const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
         bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
         bool is_vbi = vfd->vfl_type == VFL_TYPE_VBI;
+        bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
         bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
 
@@ -930,6 +949,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
                 if (is_vbi && is_tx && ops->vidioc_g_fmt_sliced_vbi_out)
                         return 0;
                 break;
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap)
+                        return 0;
+                break;
         default:
                 break;
         }
@@ -1049,6 +1072,10 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
                 if (unlikely(!is_tx || !ops->vidioc_enum_fmt_vid_out_mplane))
                         break;
                 return ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg);
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                if (unlikely(!is_rx || !ops->vidioc_enum_fmt_sdr_cap))
+                        break;
+                return ops->vidioc_enum_fmt_sdr_cap(file, fh, arg);
         }
         return -EINVAL;
 }
@@ -1059,6 +1086,7 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
         struct v4l2_format *p = arg;
         struct video_device *vfd = video_devdata(file);
         bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
+        bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
         bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
 
@@ -1103,6 +1131,10 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
                 if (unlikely(!is_tx || is_vid || !ops->vidioc_g_fmt_sliced_vbi_out))
                         break;
                 return ops->vidioc_g_fmt_sliced_vbi_out(file, fh, arg);
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap))
+                        break;
+                return ops->vidioc_g_fmt_sdr_cap(file, fh, arg);
         }
         return -EINVAL;
 }
@@ -1113,6 +1145,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
         struct v4l2_format *p = arg;
         struct video_device *vfd = video_devdata(file);
         bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
+        bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
         bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
 
@@ -1167,6 +1200,11 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
                         break;
                 CLEAR_AFTER_FIELD(p, fmt.sliced);
                 return ops->vidioc_s_fmt_sliced_vbi_out(file, fh, arg);
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                if (unlikely(!is_rx || !is_sdr || !ops->vidioc_s_fmt_sdr_cap))
+                        break;
+                CLEAR_AFTER_FIELD(p, fmt.sdr);
+                return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);
         }
         return -EINVAL;
 }
@@ -1177,6 +1215,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
         struct v4l2_format *p = arg;
         struct video_device *vfd = video_devdata(file);
         bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
+        bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
         bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
 
@@ -1231,6 +1270,11 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
                         break;
                 CLEAR_AFTER_FIELD(p, fmt.sliced);
                 return ops->vidioc_try_fmt_sliced_vbi_out(file, fh, arg);
+        case V4L2_BUF_TYPE_SDR_CAPTURE:
+                if (unlikely(!is_rx || !is_sdr || !ops->vidioc_try_fmt_sdr_cap))
+                        break;
+                CLEAR_AFTER_FIELD(p, fmt.sdr);
+                return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);
         }
         return -EINVAL;
 }
@@ -1291,8 +1335,11 @@ static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops,
         struct video_device *vfd = video_devdata(file);
         struct v4l2_frequency *p = arg;
 
-        p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-                        V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+        if (vfd->vfl_type == VFL_TYPE_SDR)
+                p->type = V4L2_TUNER_ADC;
+        else
+                p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
+                                V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
         return ops->vidioc_g_frequency(file, fh, p);
 }
 
@@ -1303,10 +1350,15 @@ static int v4l_s_frequency(const struct v4l2_ioctl_ops *ops,
         const struct v4l2_frequency *p = arg;
         enum v4l2_tuner_type type;
 
-        type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-                        V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
-        if (p->type != type)
-                return -EINVAL;
+        if (vfd->vfl_type == VFL_TYPE_SDR) {
+                if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)
+                        return -EINVAL;
+        } else {
+                type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
+                                V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+                if (type != p->type)
+                        return -EINVAL;
+        }
         return ops->vidioc_s_frequency(file, fh, p);
 }
 
@@ -1386,6 +1438,10 @@ static int v4l_s_hw_freq_seek(const struct v4l2_ioctl_ops *ops,
         struct v4l2_hw_freq_seek *p = arg;
         enum v4l2_tuner_type type;
 
+        /* s_hw_freq_seek is not supported for SDR for now */
+        if (vfd->vfl_type == VFL_TYPE_SDR)
+                return -EINVAL;
+
         type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
                 V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
         if (p->type != type)
@@ -1885,11 +1941,16 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
         enum v4l2_tuner_type type;
         int err;
 
-        type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-                        V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
-
-        if (type != p->type)
-                return -EINVAL;
+        if (vfd->vfl_type == VFL_TYPE_SDR) {
+                if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)
+                        return -EINVAL;
+                type = p->type;
+        } else {
+                type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
+                                V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+                if (type != p->type)
+                        return -EINVAL;
+        }
         if (ops->vidioc_enum_freq_bands)
                 return ops->vidioc_enum_freq_bands(file, fh, p);
         if (is_valid_ioctl(vfd, VIDIOC_G_TUNER)) {
@@ -2009,6 +2070,8 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = {
         IOCTL_INFO_FNC(VIDIOC_QUERYMENU, v4l_querymenu, v4l_print_querymenu, INFO_FL_CTRL | INFO_FL_CLEAR(v4l2_querymenu, index)),
         IOCTL_INFO_STD(VIDIOC_G_INPUT, vidioc_g_input, v4l_print_u32, 0),
         IOCTL_INFO_FNC(VIDIOC_S_INPUT, v4l_s_input, v4l_print_u32, INFO_FL_PRIO),
+        IOCTL_INFO_STD(VIDIOC_G_EDID, vidioc_g_edid, v4l_print_edid, INFO_FL_CLEAR(v4l2_edid, edid)),
+        IOCTL_INFO_STD(VIDIOC_S_EDID, vidioc_s_edid, v4l_print_edid, INFO_FL_PRIO | INFO_FL_CLEAR(v4l2_edid, edid)),
         IOCTL_INFO_STD(VIDIOC_G_OUTPUT, vidioc_g_output, v4l_print_u32, 0),
         IOCTL_INFO_FNC(VIDIOC_S_OUTPUT, v4l_s_output, v4l_print_u32, INFO_FL_PRIO),
         IOCTL_INFO_FNC(VIDIOC_ENUMOUTPUT, v4l_enumoutput, v4l_print_enumoutput, INFO_FL_CLEAR(v4l2_output, index)),
@@ -2221,9 +2284,9 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
                 break;
         }
 
-        case VIDIOC_SUBDEV_G_EDID:
-        case VIDIOC_SUBDEV_S_EDID: {
-                struct v4l2_subdev_edid *edid = parg;
+        case VIDIOC_G_EDID:
+        case VIDIOC_S_EDID: {
+                struct v4l2_edid *edid = parg;
 
                 if (edid->blocks) {
                         if (edid->blocks > 256) {