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:
 - V4L2 API additions to better support JPEG compression control
 - media API additions to properly support MPEG decoders
 - V4L2 API additions for image crop/scaling
 - a few other V4L2 API DocBook fixes/improvements
 - two new DVB frontend drivers: m88rs2000 and rtl2830
 - two new DVB drivers: az6007 and rtl28xxu
 - a framework for ISA drivers, that removed lots of common code found
   at the ISA radio drivers
 - a new FM transmitter driver (radio-keene)
 - a GPIO-based IR receiver driver
 - a new sensor driver: mt9m032
 - some new video drivers: adv7183, blackfin, mx2_emmaprp, sii9234_drv,
   vs6624
 - several new board additions, driver fixes, improvements and cleanups.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (295 commits)
  [media] update CARDLIST.em28xx
  [media] partially reverts changeset fa5527c
  [media] stb0899: fix the limits for signal strength values
  [media] em28xx: support for 2304:0242 PCTV QuatroStick (510e)
  [media] em28xx: support for 2013:0251 PCTV QuatroStick nano (520e)
  [media] -EINVAL -> -ENOTTY
  [media] gspca - sn9c20x: Cleanup source
  [media] gspca - sn9c20x: Simplify register write for capture start/stop
  [media] gspca - sn9c20x: Add automatic JPEG compression mechanism
  [media] gspca - sn9c20x: Greater delay in case of sensor no response
  [media] gspca - sn9c20x: Optimize the code of write sequences
  [media] gspca - sn9c20x: Add the JPEG compression quality control
  [media] gspca - sn9c20x: Add a delay after Omnivision sensor reset
  [media] gspca - sn9c20x: Propagate USB errors to higher level
  [media] gspca - sn9c20x: Use the new video control mechanism
  [media] gspca - sn9c20x: Fix loss of frame start
  [media] gspca - zc3xx: Lack of register 08 value for sensor cs2102k
  [media] gspca - ov534_9: Add brightness to OmniVision 5621 sensor
  [media] gspca - zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support
  [media] pvrusb2: fix 7MHz & 8MHz DVB-T tuner support for HVR1900 rev D1F5
  ...

1 files changed, 105 insertions, 0 deletions

diff --git a/drivers/media/radio/radio-isa.h b/drivers/media/radio/radio-isa.h
new file mode 100644
index 000000000000..8a0ea84d86de
--- /dev/null
+++ b/drivers/media/radio/radio-isa.h
@@ -0,0 +1,105 @@
+/*
+ * Framework for ISA radio drivers.
+ * This takes care of all the V4L2 scaffolding, allowing the ISA drivers
+ * to concentrate on the actual hardware operation.
+ *
+ * Copyright (C) 2012 Hans Verkuil <hans.verkuil@cisco.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _RADIO_ISA_H_
+#define _RADIO_ISA_H_
+
+#include <linux/isa.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
+
+struct radio_isa_driver;
+struct radio_isa_ops;
+
+/* Core structure for radio ISA cards */
+struct radio_isa_card {
+        const struct radio_isa_driver *drv;
+        struct v4l2_device v4l2_dev;
+        struct v4l2_ctrl_handler hdl;
+        struct video_device vdev;
+        struct mutex lock;
+        const struct radio_isa_ops *ops;
+        struct {        /* mute/volume cluster */
+                struct v4l2_ctrl *mute;
+                struct v4l2_ctrl *volume;
+        };
+        /* I/O port */
+        int io;
+
+        /* Card is in stereo audio mode */
+        bool stereo;
+        /* Current frequency */
+        u32 freq;
+};
+
+struct radio_isa_ops {
+        /* Allocate and initialize a radio_isa_card struct */
+        struct radio_isa_card *(*alloc)(void);
+        /* Probe whether a card is present at the given port */
+        bool (*probe)(struct radio_isa_card *isa, int io);
+        /* Special card initialization can be done here, this is called after
+         * the standard controls are registered, but before they are setup,
+         * thus allowing drivers to add their own controls here. */
+        int (*init)(struct radio_isa_card *isa);
+        /* Set mute and volume. */
+        int (*s_mute_volume)(struct radio_isa_card *isa, bool mute, int volume);
+        /* Set frequency */
+        int (*s_frequency)(struct radio_isa_card *isa, u32 freq);
+        /* Set stereo/mono audio mode */
+        int (*s_stereo)(struct radio_isa_card *isa, bool stereo);
+        /* Get rxsubchans value for VIDIOC_G_TUNER */
+        u32 (*g_rxsubchans)(struct radio_isa_card *isa);
+        /* Get the signal strength for VIDIOC_G_TUNER */
+        u32 (*g_signal)(struct radio_isa_card *isa);
+};
+
+/* Top level structure needed to instantiate the cards */
+struct radio_isa_driver {
+        struct isa_driver driver;
+        const struct radio_isa_ops *ops;
+        /* The module_param_array with the specified I/O ports */
+        int *io_params;
+        /* The module_param_array with the radio_nr values */
+        int *radio_nr_params;
+        /* Whether we should probe for possible cards */
+        bool probe;
+        /* The list of possible I/O ports */
+        const int *io_ports;
+        /* The size of that list */
+        int num_of_io_ports;
+        /* The region size to request */
+        unsigned region_size;
+        /* The name of the card */
+        const char *card;
+        /* Card can capture stereo audio */
+        bool has_stereo;
+        /* The maximum volume for the volume control. If 0, then there
+           is no volume control possible. */
+        int max_volume;
+};
+
+int radio_isa_match(struct device *pdev, unsigned int dev);
+int radio_isa_probe(struct device *pdev, unsigned int dev);
+int radio_isa_remove(struct device *pdev, unsigned int dev);
+
+#endif