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, 28 insertions, 4 deletions

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 0a30dbf3d05c..634d863c05b4 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -554,6 +554,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
         bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER;
         bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI;
         bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO;
+        bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vdev->vfl_dir != VFL_DIR_TX;
         bool is_tx = vdev->vfl_dir != VFL_DIR_RX;
 
@@ -662,9 +663,20 @@ static void determine_valid_ioctls(struct video_device *vdev)
                                ops->vidioc_try_fmt_sliced_vbi_out)))
                         set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
                 SET_VALID_IOCTL(ops, VIDIOC_G_SLICED_VBI_CAP, vidioc_g_sliced_vbi_cap);
+        } else if (is_sdr) {
+                /* SDR specific ioctls */
+                if (ops->vidioc_enum_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
+                if (ops->vidioc_g_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
+                if (ops->vidioc_s_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
+                if (ops->vidioc_try_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
         }
-        if (!is_radio) {
-                /* ioctls valid for video or vbi */
+
+        if (is_vid || is_vbi || is_sdr) {
+                /* ioctls valid for video, vbi or sdr */
                 SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
                 SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);
                 SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf);
@@ -672,6 +684,10 @@ static void determine_valid_ioctls(struct video_device *vdev)
                 SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
                 SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
                 SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
+        }
+
+        if (is_vid || is_vbi) {
+                /* ioctls valid for video or vbi */
                 if (ops->vidioc_s_std)
                         set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls);
                 SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std);
@@ -685,6 +701,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
                         SET_VALID_IOCTL(ops, VIDIOC_G_AUDIO, vidioc_g_audio);
                         SET_VALID_IOCTL(ops, VIDIOC_S_AUDIO, vidioc_s_audio);
                         SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings);
+                        SET_VALID_IOCTL(ops, VIDIOC_S_EDID, vidioc_s_edid);
                 }
                 if (is_tx) {
                         SET_VALID_IOCTL(ops, VIDIOC_ENUMOUTPUT, vidioc_enum_output);
@@ -710,9 +727,10 @@ static void determine_valid_ioctls(struct video_device *vdev)
                 SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings);
                 SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);
                 SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap);
+                SET_VALID_IOCTL(ops, VIDIOC_G_EDID, vidioc_g_edid);
         }
-        if (is_tx) {
-                /* transmitter only ioctls */
+        if (is_tx && (is_radio || is_sdr)) {
+                /* radio transmitter only ioctls */
                 SET_VALID_IOCTL(ops, VIDIOC_G_MODULATOR, vidioc_g_modulator);
                 SET_VALID_IOCTL(ops, VIDIOC_S_MODULATOR, vidioc_s_modulator);
         }
@@ -758,6 +776,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
  *      %VFL_TYPE_RADIO - A radio card
  *
  *      %VFL_TYPE_SUBDEV - A subdevice
+ *
+ *      %VFL_TYPE_SDR - Software Defined Radio
  */
 int __video_register_device(struct video_device *vdev, int type, int nr,
                 int warn_if_nr_in_use, struct module *owner)
@@ -797,6 +817,10 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
         case VFL_TYPE_SUBDEV:
                 name_base = "v4l-subdev";
                 break;
+        case VFL_TYPE_SDR:
+                /* Use device name 'swradio' because 'sdr' was already taken. */
+                name_base = "swradio";
+                break;
         default:
                 printk(KERN_ERR "%s called with unknown type: %d\n",
                        __func__, type);