Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
  V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
  V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
  V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
  V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
  V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
  V4L/DVB (7782): pvrusb2: Driver is no longer experimental
  V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
  V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
  V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
  Rename common tuner Kconfig names to use the same
  Fix V4L/DVB core help messages
  V4L/DVB (7769): Move other terrestrial tuners to common/tuners
  V4L/DVB (7768): reorganize some DVB-S Kconfig items
  V4L/DVB(7767): Move tuners to common/tuners
  V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
  V4L/DVB (7765): Add support for Beholder BeholdTV H6
  V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
  V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
  V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
  V4L/DVB (7759): ivtv: increase version number to 1.2.1
  ...

1 files changed, 288 insertions, 0 deletions

diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
new file mode 100644
index 000000000000..65efe69d939a
--- /dev/null
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -0,0 +1,288 @@
+/*
+ *  cx18 functions for DVB support
+ *
+ *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "cx18-version.h"
+#include "cx18-dvb.h"
+#include "cx18-streams.h"
+#include "cx18-cards.h"
+#include "s5h1409.h"
+
+/* Wait until the MXL500X driver is merged */
+#ifdef HAVE_MXL500X
+#include "mxl500x.h"
+#endif
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+#define CX18_REG_DMUX_NUM_PORT_0_CONTROL 0xd5a000
+
+#ifdef HAVE_MXL500X
+static struct mxl500x_config hauppauge_hvr1600_tuner = {
+        .delsys    = MXL500x_MODE_ATSC,
+        .octf      = MXL500x_OCTF_CH,
+        .xtal_freq = 16000000,
+        .iflo_freq = 5380000,
+        .ref_freq  = 322800000,
+        .rssi_ena  = MXL_RSSI_ENABLE,
+        .addr      = 0xC6 >> 1,
+};
+
+static struct s5h1409_config hauppauge_hvr1600_config = {
+        .demod_address = 0x32 >> 1,
+        .output_mode   = S5H1409_SERIAL_OUTPUT,
+        .gpio          = S5H1409_GPIO_ON,
+        .qam_if        = 44000,
+        .inversion     = S5H1409_INVERSION_OFF,
+        .status_mode   = S5H1409_DEMODLOCKING,
+        .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
+
+};
+#endif
+
+static int dvb_register(struct cx18_stream *stream);
+
+/* Kernel DVB framework calls this when the feed needs to start.
+ * The CX18 framework should enable the transport DMA handling
+ * and queue processing.
+ */
+static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)
+{
+        struct dvb_demux *demux = feed->demux;
+        struct cx18_stream *stream = (struct cx18_stream *) demux->priv;
+        struct cx18 *cx = stream->cx;
+        int ret = -EINVAL;
+        u32 v;
+
+        CX18_DEBUG_INFO("Start feed: pid = 0x%x index = %d\n",
+                        feed->pid, feed->index);
+        switch (cx->card->type) {
+        case CX18_CARD_HVR_1600_ESMT:
+        case CX18_CARD_HVR_1600_SAMSUNG:
+                v = read_reg(CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                v |= 0x00400000; /* Serial Mode */
+                v |= 0x00002000; /* Data Length - Byte */
+                v |= 0x00010000; /* Error - Polarity */
+                v |= 0x00020000; /* Error - Passthru */
+                v |= 0x000c0000; /* Error - Ignore */
+                write_reg(v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                break;
+
+        default:
+                /* Assumption - Parallel transport - Signalling
+                 * undefined or default.
+                 */
+                break;
+        }
+
+        if (!demux->dmx.frontend)
+                return -EINVAL;
+
+        if (stream) {
+                mutex_lock(&stream->dvb.feedlock);
+                if (stream->dvb.feeding++ == 0) {
+                        CX18_DEBUG_INFO("Starting Transport DMA\n");
+                        ret = cx18_start_v4l2_encode_stream(stream);
+                } else
+                        ret = 0;
+                mutex_unlock(&stream->dvb.feedlock);
+        }
+
+        return ret;
+}
+
+/* Kernel DVB framework calls this when the feed needs to stop. */
+static int cx18_dvb_stop_feed(struct dvb_demux_feed *feed)
+{
+        struct dvb_demux *demux = feed->demux;
+        struct cx18_stream *stream = (struct cx18_stream *)demux->priv;
+        struct cx18 *cx = stream->cx;
+        int ret = -EINVAL;
+
+        CX18_DEBUG_INFO("Stop feed: pid = 0x%x index = %d\n",
+                        feed->pid, feed->index);
+
+        if (stream) {
+                mutex_lock(&stream->dvb.feedlock);
+                if (--stream->dvb.feeding == 0) {
+                        CX18_DEBUG_INFO("Stopping Transport DMA\n");
+                        ret = cx18_stop_v4l2_encode_stream(stream, 0);
+                } else
+                        ret = 0;
+                mutex_unlock(&stream->dvb.feedlock);
+        }
+
+        return ret;
+}
+
+int cx18_dvb_register(struct cx18_stream *stream)
+{
+        struct cx18 *cx = stream->cx;
+        struct cx18_dvb *dvb = &stream->dvb;
+        struct dvb_adapter *dvb_adapter;
+        struct dvb_demux *dvbdemux;
+        struct dmx_demux *dmx;
+        int ret;
+
+        if (!dvb)
+                return -EINVAL;
+
+        ret = dvb_register_adapter(&dvb->dvb_adapter,
+                        CX18_DRIVER_NAME,
+                        THIS_MODULE, &cx->dev->dev, adapter_nr);
+        if (ret < 0)
+                goto err_out;
+
+        dvb_adapter = &dvb->dvb_adapter;
+
+        dvbdemux = &dvb->demux;
+
+        dvbdemux->priv = (void *)stream;
+
+        dvbdemux->filternum = 256;
+        dvbdemux->feednum = 256;
+        dvbdemux->start_feed = cx18_dvb_start_feed;
+        dvbdemux->stop_feed = cx18_dvb_stop_feed;
+        dvbdemux->dmx.capabilities = (DMX_TS_FILTERING |
+                DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING);
+        ret = dvb_dmx_init(dvbdemux);
+        if (ret < 0)
+                goto err_dvb_unregister_adapter;
+
+        dmx = &dvbdemux->dmx;
+
+        dvb->hw_frontend.source = DMX_FRONTEND_0;
+        dvb->mem_frontend.source = DMX_MEMORY_FE;
+        dvb->dmxdev.filternum = 256;
+        dvb->dmxdev.demux = dmx;
+
+        ret = dvb_dmxdev_init(&dvb->dmxdev, dvb_adapter);
+        if (ret < 0)
+                goto err_dvb_dmx_release;
+
+        ret = dmx->add_frontend(dmx, &dvb->hw_frontend);
+        if (ret < 0)
+                goto err_dvb_dmxdev_release;
+
+        ret = dmx->add_frontend(dmx, &dvb->mem_frontend);
+        if (ret < 0)
+                goto err_remove_hw_frontend;
+
+        ret = dmx->connect_frontend(dmx, &dvb->hw_frontend);
+        if (ret < 0)
+                goto err_remove_mem_frontend;
+
+        ret = dvb_register(stream);
+        if (ret < 0)
+                goto err_disconnect_frontend;
+
+        dvb_net_init(dvb_adapter, &dvb->dvbnet, dmx);
+
+        CX18_INFO("DVB Frontend registered\n");
+        mutex_init(&dvb->feedlock);
+        dvb->enabled = 1;
+        return ret;
+
+err_disconnect_frontend:
+        dmx->disconnect_frontend(dmx);
+err_remove_mem_frontend:
+        dmx->remove_frontend(dmx, &dvb->mem_frontend);
+err_remove_hw_frontend:
+        dmx->remove_frontend(dmx, &dvb->hw_frontend);
+err_dvb_dmxdev_release:
+        dvb_dmxdev_release(&dvb->dmxdev);
+err_dvb_dmx_release:
+        dvb_dmx_release(dvbdemux);
+err_dvb_unregister_adapter:
+        dvb_unregister_adapter(dvb_adapter);
+err_out:
+        return ret;
+}
+
+void cx18_dvb_unregister(struct cx18_stream *stream)
+{
+        struct cx18 *cx = stream->cx;
+        struct cx18_dvb *dvb = &stream->dvb;
+        struct dvb_adapter *dvb_adapter;
+        struct dvb_demux *dvbdemux;
+        struct dmx_demux *dmx;
+
+        CX18_INFO("unregister DVB\n");
+
+        dvb_adapter = &dvb->dvb_adapter;
+        dvbdemux = &dvb->demux;
+        dmx = &dvbdemux->dmx;
+
+        dmx->close(dmx);
+        dvb_net_release(&dvb->dvbnet);
+        dmx->remove_frontend(dmx, &dvb->mem_frontend);
+        dmx->remove_frontend(dmx, &dvb->hw_frontend);
+        dvb_dmxdev_release(&dvb->dmxdev);
+        dvb_dmx_release(dvbdemux);
+        dvb_unregister_frontend(dvb->fe);
+        dvb_frontend_detach(dvb->fe);
+        dvb_unregister_adapter(dvb_adapter);
+}
+
+/* All the DVB attach calls go here, this function get's modified
+ * for each new card. No other function in this file needs
+ * to change.
+ */
+static int dvb_register(struct cx18_stream *stream)
+{
+        struct cx18_dvb *dvb = &stream->dvb;
+        struct cx18 *cx = stream->cx;
+        int ret = 0;
+
+        switch (cx->card->type) {
+/* Wait until the MXL500X driver is merged */
+#ifdef HAVE_MXL500X
+        case CX18_CARD_HVR_1600_ESMT:
+        case CX18_CARD_HVR_1600_SAMSUNG:
+                dvb->fe = dvb_attach(s5h1409_attach,
+                        &hauppauge_hvr1600_config,
+                        &cx->i2c_adap[0]);
+                if (dvb->fe != NULL) {
+                        dvb_attach(mxl500x_attach, dvb->fe,
+                                &hauppauge_hvr1600_tuner,
+                                &cx->i2c_adap[0]);
+                        ret = 0;
+                }
+                break;
+#endif
+        default:
+                /* No Digital Tv Support */
+                break;
+        }
+
+        if (dvb->fe == NULL) {
+                CX18_ERR("frontend initialization failed\n");
+                return -1;
+        }
+
+        ret = dvb_register_frontend(&dvb->dvb_adapter, dvb->fe);
+        if (ret < 0) {
+                if (dvb->fe->ops.release)
+                        dvb->fe->ops.release(dvb->fe);
+                return ret;
+        }
+
+        return ret;
+}