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: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...

9 files changed, 2359 insertions, 138 deletions

diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 1fd326fe4113..ca5fbce3a909 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -8,6 +8,7 @@ config VIDEO_CX23885
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEOBUF_DVB
+        select VIDEO_CX25840
         select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
@@ -16,6 +17,7 @@ config VIDEO_CX23885
         select TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         select DVB_TDA18271 if !DVB_FE_CUSTOMIZE
         select DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+        select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Conexant 23885 based
           TV cards.
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile
index 32c90be50602..d7b0721af062 100644
--- a/drivers/media/video/cx23885/Makefile
+++ b/drivers/media/video/cx23885/Makefile
@@ -1,4 +1,4 @@
-cx23885-objs    := cx23885-cards.o cx23885-video.o cx23885-vbi.o cx23885-core.o cx23885-i2c.o cx23885-dvb.o
+cx23885-objs    := cx23885-cards.o cx23885-video.o cx23885-vbi.o cx23885-core.o cx23885-i2c.o cx23885-dvb.o cx23885-417.o
 
 obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
 
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
new file mode 100644
index 000000000000..acdd3b6b3e7c
--- /dev/null
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -0,0 +1,1764 @@
+/*
+ *
+ *  Support for a cx23417 mpeg encoder via cx23885 host port.
+ *
+ *    (c) 2004 Jelle Foks <jelle@foks.8m.com>
+ *    (c) 2004 Gerd Knorr <kraxel@bytesex.org>
+ *    (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *      - CX23885/7/8 support
+ *
+ *  Includes parts from the ivtv driver( http://ivtv.sourceforge.net/),
+ *
+ *  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 <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/firmware.h>
+#include <media/v4l2-common.h>
+#include <media/cx2341x.h>
+
+#include "cx23885.h"
+#include "media/cx2341x.h"
+
+#define CX23885_FIRM_IMAGE_SIZE 376836
+#define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"
+
+static unsigned int mpegbufs = 32;
+module_param(mpegbufs, int, 0644);
+MODULE_PARM_DESC(mpegbufs, "number of mpeg buffers, range 2-32");
+static unsigned int mpeglines = 32;
+module_param(mpeglines, int, 0644);
+MODULE_PARM_DESC(mpeglines, "number of lines in an MPEG buffer, range 2-32");
+static unsigned int mpeglinesize = 512;
+module_param(mpeglinesize, int, 0644);
+MODULE_PARM_DESC(mpeglinesize,
+        "number of bytes in each line of an MPEG buffer, range 512-1024");
+
+static unsigned int v4l_debug;
+module_param(v4l_debug, int, 0644);
+MODULE_PARM_DESC(v4l_debug, "enable V4L debug messages");
+
+#define dprintk(level, fmt, arg...)\
+        do { if (v4l_debug >= level) \
+                printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg);\
+        } while (0)
+
+static struct cx23885_tvnorm cx23885_tvnorms[] = {
+        {
+                .name      = "NTSC-M",
+                .id        = V4L2_STD_NTSC_M,
+        }, {
+                .name      = "NTSC-JP",
+                .id        = V4L2_STD_NTSC_M_JP,
+        }, {
+                .name      = "PAL-BG",
+                .id        = V4L2_STD_PAL_BG,
+        }, {
+                .name      = "PAL-DK",
+                .id        = V4L2_STD_PAL_DK,
+        }, {
+                .name      = "PAL-I",
+                .id        = V4L2_STD_PAL_I,
+        }, {
+                .name      = "PAL-M",
+                .id        = V4L2_STD_PAL_M,
+        }, {
+                .name      = "PAL-N",
+                .id        = V4L2_STD_PAL_N,
+        }, {
+                .name      = "PAL-Nc",
+                .id        = V4L2_STD_PAL_Nc,
+        }, {
+                .name      = "PAL-60",
+                .id        = V4L2_STD_PAL_60,
+        }, {
+                .name      = "SECAM-L",
+                .id        = V4L2_STD_SECAM_L,
+        }, {
+                .name      = "SECAM-DK",
+                .id        = V4L2_STD_SECAM_DK,
+        }
+};
+
+/* ------------------------------------------------------------------ */
+enum cx23885_capture_type {
+        CX23885_MPEG_CAPTURE,
+        CX23885_RAW_CAPTURE,
+        CX23885_RAW_PASSTHRU_CAPTURE
+};
+enum cx23885_capture_bits {
+        CX23885_RAW_BITS_NONE             = 0x00,
+        CX23885_RAW_BITS_YUV_CAPTURE      = 0x01,
+        CX23885_RAW_BITS_PCM_CAPTURE      = 0x02,
+        CX23885_RAW_BITS_VBI_CAPTURE      = 0x04,
+        CX23885_RAW_BITS_PASSTHRU_CAPTURE = 0x08,
+        CX23885_RAW_BITS_TO_HOST_CAPTURE  = 0x10
+};
+enum cx23885_capture_end {
+        CX23885_END_AT_GOP, /* stop at the end of gop, generate irq */
+        CX23885_END_NOW, /* stop immediately, no irq */
+};
+enum cx23885_framerate {
+        CX23885_FRAMERATE_NTSC_30, /* NTSC: 30fps */
+        CX23885_FRAMERATE_PAL_25   /* PAL: 25fps */
+};
+enum cx23885_stream_port {
+        CX23885_OUTPUT_PORT_MEMORY,
+        CX23885_OUTPUT_PORT_STREAMING,
+        CX23885_OUTPUT_PORT_SERIAL
+};
+enum cx23885_data_xfer_status {
+        CX23885_MORE_BUFFERS_FOLLOW,
+        CX23885_LAST_BUFFER,
+};
+enum cx23885_picture_mask {
+        CX23885_PICTURE_MASK_NONE,
+        CX23885_PICTURE_MASK_I_FRAMES,
+        CX23885_PICTURE_MASK_I_P_FRAMES = 0x3,
+        CX23885_PICTURE_MASK_ALL_FRAMES = 0x7,
+};
+enum cx23885_vbi_mode_bits {
+        CX23885_VBI_BITS_SLICED,
+        CX23885_VBI_BITS_RAW,
+};
+enum cx23885_vbi_insertion_bits {
+        CX23885_VBI_BITS_INSERT_IN_XTENSION_USR_DATA,
+        CX23885_VBI_BITS_INSERT_IN_PRIVATE_PACKETS = 0x1 << 1,
+        CX23885_VBI_BITS_SEPARATE_STREAM = 0x2 << 1,
+        CX23885_VBI_BITS_SEPARATE_STREAM_USR_DATA = 0x4 << 1,
+        CX23885_VBI_BITS_SEPARATE_STREAM_PRV_DATA = 0x5 << 1,
+};
+enum cx23885_dma_unit {
+        CX23885_DMA_BYTES,
+        CX23885_DMA_FRAMES,
+};
+enum cx23885_dma_transfer_status_bits {
+        CX23885_DMA_TRANSFER_BITS_DONE = 0x01,
+        CX23885_DMA_TRANSFER_BITS_ERROR = 0x04,
+        CX23885_DMA_TRANSFER_BITS_LL_ERROR = 0x10,
+};
+enum cx23885_pause {
+        CX23885_PAUSE_ENCODING,
+        CX23885_RESUME_ENCODING,
+};
+enum cx23885_copyright {
+        CX23885_COPYRIGHT_OFF,
+        CX23885_COPYRIGHT_ON,
+};
+enum cx23885_notification_type {
+        CX23885_NOTIFICATION_REFRESH,
+};
+enum cx23885_notification_status {
+        CX23885_NOTIFICATION_OFF,
+        CX23885_NOTIFICATION_ON,
+};
+enum cx23885_notification_mailbox {
+        CX23885_NOTIFICATION_NO_MAILBOX = -1,
+};
+enum cx23885_field1_lines {
+        CX23885_FIELD1_SAA7114 = 0x00EF, /* 239 */
+        CX23885_FIELD1_SAA7115 = 0x00F0, /* 240 */
+        CX23885_FIELD1_MICRONAS = 0x0105, /* 261 */
+};
+enum cx23885_field2_lines {
+        CX23885_FIELD2_SAA7114 = 0x00EF, /* 239 */
+        CX23885_FIELD2_SAA7115 = 0x00F0, /* 240 */
+        CX23885_FIELD2_MICRONAS = 0x0106, /* 262 */
+};
+enum cx23885_custom_data_type {
+        CX23885_CUSTOM_EXTENSION_USR_DATA,
+        CX23885_CUSTOM_PRIVATE_PACKET,
+};
+enum cx23885_mute {
+        CX23885_UNMUTE,
+        CX23885_MUTE,
+};
+enum cx23885_mute_video_mask {
+        CX23885_MUTE_VIDEO_V_MASK = 0x0000FF00,
+        CX23885_MUTE_VIDEO_U_MASK = 0x00FF0000,
+        CX23885_MUTE_VIDEO_Y_MASK = 0xFF000000,
+};
+enum cx23885_mute_video_shift {
+        CX23885_MUTE_VIDEO_V_SHIFT = 8,
+        CX23885_MUTE_VIDEO_U_SHIFT = 16,
+        CX23885_MUTE_VIDEO_Y_SHIFT = 24,
+};
+
+/* defines below are from ivtv-driver.h */
+#define IVTV_CMD_HW_BLOCKS_RST 0xFFFFFFFF
+
+/* Firmware API commands */
+#define IVTV_API_STD_TIMEOUT 500
+
+/* Registers */
+/* IVTV_REG_OFFSET */
+#define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8)
+#define IVTV_REG_ENC_SDRAM_PRECHARGE (0x07FC)
+#define IVTV_REG_SPU (0x9050)
+#define IVTV_REG_HW_BLOCKS (0x9054)
+#define IVTV_REG_VPU (0x9058)
+#define IVTV_REG_APU (0xA064)
+
+/**** Bit definitions for MC417_RWD and MC417_OEN registers  ***
+  bits 31-16
++-----------+
+| Reserved  |
++-----------+
+  bit 15  bit 14  bit 13 bit 12  bit 11  bit 10  bit 9   bit 8
++-------+-------+-------+-------+-------+-------+-------+-------+
+| MIWR# | MIRD# | MICS# |MIRDY# |MIADDR3|MIADDR2|MIADDR1|MIADDR0|
++-------+-------+-------+-------+-------+-------+-------+-------+
+ bit 7   bit 6   bit 5   bit 4   bit 3   bit 2   bit 1   bit 0
++-------+-------+-------+-------+-------+-------+-------+-------+
+|MIDATA7|MIDATA6|MIDATA5|MIDATA4|MIDATA3|MIDATA2|MIDATA1|MIDATA0|
++-------+-------+-------+-------+-------+-------+-------+-------+
+***/
+#define MC417_MIWR      0x8000
+#define MC417_MIRD      0x4000
+#define MC417_MICS      0x2000
+#define MC417_MIRDY     0x1000
+#define MC417_MIADDR    0x0F00
+#define MC417_MIDATA    0x00FF
+
+/* MIADDR* nibble definitions */
+#define  MCI_MEMORY_DATA_BYTE0          0x000
+#define  MCI_MEMORY_DATA_BYTE1          0x100
+#define  MCI_MEMORY_DATA_BYTE2          0x200
+#define  MCI_MEMORY_DATA_BYTE3          0x300
+#define  MCI_MEMORY_ADDRESS_BYTE2       0x400
+#define  MCI_MEMORY_ADDRESS_BYTE1       0x500
+#define  MCI_MEMORY_ADDRESS_BYTE0       0x600
+#define  MCI_REGISTER_DATA_BYTE0        0x800
+#define  MCI_REGISTER_DATA_BYTE1        0x900
+#define  MCI_REGISTER_DATA_BYTE2        0xA00
+#define  MCI_REGISTER_DATA_BYTE3        0xB00
+#define  MCI_REGISTER_ADDRESS_BYTE0     0xC00
+#define  MCI_REGISTER_ADDRESS_BYTE1     0xD00
+#define  MCI_REGISTER_MODE              0xE00
+
+/* Read and write modes */
+#define  MCI_MODE_REGISTER_READ         0
+#define  MCI_MODE_REGISTER_WRITE        1
+#define  MCI_MODE_MEMORY_READ           0
+#define  MCI_MODE_MEMORY_WRITE          0x40
+
+/*** Bit definitions for MC417_CTL register ****
+ bits 31-6   bits 5-4   bit 3    bits 2-1       Bit 0
++--------+-------------+--------+--------------+------------+
+|Reserved|MC417_SPD_CTL|Reserved|MC417_GPIO_SEL|UART_GPIO_EN|
++--------+-------------+--------+--------------+------------+
+***/
+#define MC417_SPD_CTL(x)        (((x) << 4) & 0x00000030)
+#define MC417_GPIO_SEL(x)       (((x) << 1) & 0x00000006)
+#define MC417_UART_GPIO_EN      0x00000001
+
+/* Values for speed control */
+#define MC417_SPD_CTL_SLOW      0x1
+#define MC417_SPD_CTL_MEDIUM    0x0
+#define MC417_SPD_CTL_FAST      0x3     /* b'1x, but we use b'11 */
+
+/* Values for GPIO select */
+#define MC417_GPIO_SEL_GPIO3    0x3
+#define MC417_GPIO_SEL_GPIO2    0x2
+#define MC417_GPIO_SEL_GPIO1    0x1
+#define MC417_GPIO_SEL_GPIO0    0x0
+
+void cx23885_mc417_init(struct cx23885_dev *dev)
+{
+        u32 regval;
+
+        dprintk(2, "%s()\n", __func__);
+
+        /* Configure MC417_CTL register to defaults. */
+        regval = MC417_SPD_CTL(MC417_SPD_CTL_FAST)      |
+                 MC417_GPIO_SEL(MC417_GPIO_SEL_GPIO3)   |
+                 MC417_UART_GPIO_EN;
+        cx_write(MC417_CTL, regval);
+
+        /* Configure MC417_OEN to defaults. */
+        regval = MC417_MIRDY;
+        cx_write(MC417_OEN, regval);
+
+        /* Configure MC417_RWD to defaults. */
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS;
+        cx_write(MC417_RWD, regval);
+}
+
+static int mc417_wait_ready(struct cx23885_dev *dev)
+{
+        u32 mi_ready;
+        unsigned long timeout = jiffies + msecs_to_jiffies(1);
+
+        for (;;) {
+                mi_ready = cx_read(MC417_RWD) & MC417_MIRDY;
+                if (mi_ready != 0)
+                        return 0;
+                if (time_after(jiffies, timeout))
+                        return -1;
+                udelay(1);
+        }
+}
+
+static int mc417_register_write(struct cx23885_dev *dev, u16 address, u32 value)
+{
+        u32 regval;
+
+        /* Enable MC417 GPIO outputs except for MC417_MIRDY,
+         * which is an input.
+         */
+        cx_write(MC417_OEN, MC417_MIRDY);
+
+        /* Write data byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE0 |
+                (value & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+
+        /* Transition CS/WR to effect write transaction across bus. */
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE1 |
+                ((value >> 8) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE2 |
+                ((value >> 16) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 3 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE3 |
+                ((value >> 24) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_ADDRESS_BYTE0 |
+                (address & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_ADDRESS_BYTE1 |
+                ((address >> 8) & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Indicate that this is a write. */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_MODE |
+                MCI_MODE_REGISTER_WRITE;
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Wait for the trans to complete (MC417_MIRDY asserted). */
+        return mc417_wait_ready(dev);
+}
+
+static int mc417_register_read(struct cx23885_dev *dev, u16 address, u32 *value)
+{
+        int retval;
+        u32 regval;
+        u32 tempval;
+        u32 dataval;
+
+        /* Enable MC417 GPIO outputs except for MC417_MIRDY,
+         * which is an input.
+         */
+        cx_write(MC417_OEN, MC417_MIRDY);
+
+        /* Write address byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_ADDRESS_BYTE0 |
+                ((address & 0x00FF));
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_ADDRESS_BYTE1 |
+                ((address >> 8) & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Indicate that this is a register read. */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_MODE |
+                MCI_MODE_REGISTER_READ;
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Wait for the trans to complete (MC417_MIRDY asserted). */
+        retval = mc417_wait_ready(dev);
+
+        /* switch the DAT0-7 GPIO[10:3] to input mode */
+        cx_write(MC417_OEN, MC417_MIRDY | MC417_MIDATA);
+
+        /* Read data byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE0;
+        cx_write(MC417_RWD, regval);
+
+        /* Transition RD to effect read transaction across bus.
+         * Transtion 0x5000 -> 0x9000 correct (RD/RDY -> WR/RDY)?
+         * Should it be 0x9000 -> 0xF000 (also why is RDY being set, its
+         * input only...)
+         */
+        regval = MC417_MIWR | MC417_MIRDY | MCI_REGISTER_DATA_BYTE0;
+        cx_write(MC417_RWD, regval);
+
+        /* Collect byte */
+        tempval = cx_read(MC417_RWD);
+        dataval = tempval & 0x000000FF;
+
+        /* Bring CS and RD high. */
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE1;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_REGISTER_DATA_BYTE1;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= ((tempval & 0x000000FF) << 8);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE2;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_REGISTER_DATA_BYTE2;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= ((tempval & 0x000000FF) << 16);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 3 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_REGISTER_DATA_BYTE3;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_REGISTER_DATA_BYTE3;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= ((tempval & 0x000000FF) << 24);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        *value  = dataval;
+
+        return retval;
+}
+
+int mc417_memory_write(struct cx23885_dev *dev, u32 address, u32 value)
+{
+        u32 regval;
+
+        /* Enable MC417 GPIO outputs except for MC417_MIRDY,
+         * which is an input.
+         */
+        cx_write(MC417_OEN, MC417_MIRDY);
+
+        /* Write data byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE0 |
+                (value & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+
+        /* Transition CS/WR to effect write transaction across bus. */
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE1 |
+                ((value >> 8) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE2 |
+                ((value >> 16) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write data byte 3 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE3 |
+                ((value >> 24) & 0x000000FF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE2 |
+                MCI_MODE_MEMORY_WRITE | ((address >> 16) & 0x3F);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE1 |
+                ((address >> 8) & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE0 |
+                (address & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Wait for the trans to complete (MC417_MIRDY asserted). */
+        return mc417_wait_ready(dev);
+}
+
+int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value)
+{
+        int retval;
+        u32 regval;
+        u32 tempval;
+        u32 dataval;
+
+        /* Enable MC417 GPIO outputs except for MC417_MIRDY,
+         * which is an input.
+         */
+        cx_write(MC417_OEN, MC417_MIRDY);
+
+        /* Write address byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE2 |
+                MCI_MODE_MEMORY_READ | ((address >> 16) & 0x3F);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE1 |
+                ((address >> 8) & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Write address byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_ADDRESS_BYTE0 |
+                (address & 0xFF);
+        cx_write(MC417_RWD, regval);
+        regval |= MC417_MICS | MC417_MIWR;
+        cx_write(MC417_RWD, regval);
+
+        /* Wait for the trans to complete (MC417_MIRDY asserted). */
+        retval = mc417_wait_ready(dev);
+
+        /* switch the DAT0-7 GPIO[10:3] to input mode */
+        cx_write(MC417_OEN, MC417_MIRDY | MC417_MIDATA);
+
+        /* Read data byte 3 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE3;
+        cx_write(MC417_RWD, regval);
+
+        /* Transition RD to effect read transaction across bus. */
+        regval = MC417_MIWR | MC417_MIRDY | MCI_MEMORY_DATA_BYTE3;
+        cx_write(MC417_RWD, regval);
+
+        /* Collect byte */
+        tempval = cx_read(MC417_RWD);
+        dataval = ((tempval & 0x000000FF) << 24);
+
+        /* Bring CS and RD high. */
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 2 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE2;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_MEMORY_DATA_BYTE2;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= ((tempval & 0x000000FF) << 16);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 1 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE1;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_MEMORY_DATA_BYTE1;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= ((tempval & 0x000000FF) << 8);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        /* Read data byte 0 */
+        regval = MC417_MIRD | MC417_MIRDY | MCI_MEMORY_DATA_BYTE0;
+        cx_write(MC417_RWD, regval);
+        regval = MC417_MIWR | MC417_MIRDY | MCI_MEMORY_DATA_BYTE0;
+        cx_write(MC417_RWD, regval);
+        tempval = cx_read(MC417_RWD);
+        dataval |= (tempval & 0x000000FF);
+        regval = MC417_MIWR | MC417_MIRD | MC417_MICS | MC417_MIRDY;
+        cx_write(MC417_RWD, regval);
+
+        *value  = dataval;
+
+        return retval;
+}
+
+/* ------------------------------------------------------------------ */
+
+/* MPEG encoder API */
+char *cmd_to_str(int cmd)
+{
+        switch (cmd) {
+        case CX2341X_ENC_PING_FW:
+                return  "PING_FW";
+        case CX2341X_ENC_START_CAPTURE:
+                return  "START_CAPTURE";
+        case CX2341X_ENC_STOP_CAPTURE:
+                return  "STOP_CAPTURE";
+        case CX2341X_ENC_SET_AUDIO_ID:
+                return  "SET_AUDIO_ID";
+        case CX2341X_ENC_SET_VIDEO_ID:
+                return  "SET_VIDEO_ID";
+        case CX2341X_ENC_SET_PCR_ID:
+                return  "SET_PCR_PID";
+        case CX2341X_ENC_SET_FRAME_RATE:
+                return  "SET_FRAME_RATE";
+        case CX2341X_ENC_SET_FRAME_SIZE:
+                return  "SET_FRAME_SIZE";
+        case CX2341X_ENC_SET_BIT_RATE:
+                return  "SET_BIT_RATE";
+        case CX2341X_ENC_SET_GOP_PROPERTIES:
+                return  "SET_GOP_PROPERTIES";
+        case CX2341X_ENC_SET_ASPECT_RATIO:
+                return  "SET_ASPECT_RATIO";
+        case CX2341X_ENC_SET_DNR_FILTER_MODE:
+                return  "SET_DNR_FILTER_PROPS";
+        case CX2341X_ENC_SET_DNR_FILTER_PROPS:
+                return  "SET_DNR_FILTER_PROPS";
+        case CX2341X_ENC_SET_CORING_LEVELS:
+                return  "SET_CORING_LEVELS";
+        case CX2341X_ENC_SET_SPATIAL_FILTER_TYPE:
+                return  "SET_SPATIAL_FILTER_TYPE";
+        case CX2341X_ENC_SET_VBI_LINE:
+                return  "SET_VBI_LINE";
+        case CX2341X_ENC_SET_STREAM_TYPE:
+                return  "SET_STREAM_TYPE";
+        case CX2341X_ENC_SET_OUTPUT_PORT:
+                return  "SET_OUTPUT_PORT";
+        case CX2341X_ENC_SET_AUDIO_PROPERTIES:
+                return  "SET_AUDIO_PROPERTIES";
+        case CX2341X_ENC_HALT_FW:
+                return  "HALT_FW";
+        case CX2341X_ENC_GET_VERSION:
+                return  "GET_VERSION";
+        case CX2341X_ENC_SET_GOP_CLOSURE:
+                return  "SET_GOP_CLOSURE";
+        case CX2341X_ENC_GET_SEQ_END:
+                return  "GET_SEQ_END";
+        case CX2341X_ENC_SET_PGM_INDEX_INFO:
+                return  "SET_PGM_INDEX_INFO";
+        case CX2341X_ENC_SET_VBI_CONFIG:
+                return  "SET_VBI_CONFIG";
+        case CX2341X_ENC_SET_DMA_BLOCK_SIZE:
+                return  "SET_DMA_BLOCK_SIZE";
+        case CX2341X_ENC_GET_PREV_DMA_INFO_MB_10:
+                return  "GET_PREV_DMA_INFO_MB_10";
+        case CX2341X_ENC_GET_PREV_DMA_INFO_MB_9:
+                return  "GET_PREV_DMA_INFO_MB_9";
+        case CX2341X_ENC_SCHED_DMA_TO_HOST:
+                return  "SCHED_DMA_TO_HOST";
+        case CX2341X_ENC_INITIALIZE_INPUT:
+                return  "INITIALIZE_INPUT";
+        case CX2341X_ENC_SET_FRAME_DROP_RATE:
+                return  "SET_FRAME_DROP_RATE";
+        case CX2341X_ENC_PAUSE_ENCODER:
+                return  "PAUSE_ENCODER";
+        case CX2341X_ENC_REFRESH_INPUT:
+                return  "REFRESH_INPUT";
+        case CX2341X_ENC_SET_COPYRIGHT:
+                return  "SET_COPYRIGHT";
+        case CX2341X_ENC_SET_EVENT_NOTIFICATION:
+                return  "SET_EVENT_NOTIFICATION";
+        case CX2341X_ENC_SET_NUM_VSYNC_LINES:
+                return  "SET_NUM_VSYNC_LINES";
+        case CX2341X_ENC_SET_PLACEHOLDER:
+                return  "SET_PLACEHOLDER";
+        case CX2341X_ENC_MUTE_VIDEO:
+                return  "MUTE_VIDEO";
+        case CX2341X_ENC_MUTE_AUDIO:
+                return  "MUTE_AUDIO";
+        case CX2341X_ENC_MISC:
+                return  "MISC";
+        default:
+                return "UNKNOWN";
+        }
+}
+
+static int cx23885_mbox_func(void *priv,
+                             u32 command,
+                             int in,
+                             int out,
+                             u32 data[CX2341X_MBOX_MAX_DATA])
+{
+        struct cx23885_dev *dev = priv;
+        unsigned long timeout;
+        u32 value, flag, retval = 0;
+        int i;
+
+        dprintk(3, "%s: command(0x%X) = %s\n", __func__, command,
+                cmd_to_str(command));
+
+        /* this may not be 100% safe if we can't read any memory location
+           without side effects */
+        mc417_memory_read(dev, dev->cx23417_mailbox - 4, &value);
+        if (value != 0x12345678) {
+                printk(KERN_ERR
+                        "Firmware and/or mailbox pointer not initialized "
+                        "or corrupted, signature = 0x%x, cmd = %s\n", value,
+                        cmd_to_str(command));
+                return -1;
+        }
+
+        /* This read looks at 32 bits, but flag is only 8 bits.
+         * Seems we also bail if CMD or TIMEOUT bytes are set???
+         */
+        mc417_memory_read(dev, dev->cx23417_mailbox, &flag);
+        if (flag) {
+                printk(KERN_ERR "ERROR: Mailbox appears to be in use "
+                        "(%x), cmd = %s\n", flag, cmd_to_str(command));
+                return -1;
+        }
+
+        flag |= 1; /* tell 'em we're working on it */
+        mc417_memory_write(dev, dev->cx23417_mailbox, flag);
+
+        /* write command + args + fill remaining with zeros */
+        /* command code */
+        mc417_memory_write(dev, dev->cx23417_mailbox + 1, command);
+        mc417_memory_write(dev, dev->cx23417_mailbox + 3,
+                IVTV_API_STD_TIMEOUT); /* timeout */
+        for (i = 0; i < in; i++) {
+                mc417_memory_write(dev, dev->cx23417_mailbox + 4 + i, data[i]);
+                dprintk(3, "API Input %d = %d\n", i, data[i]);
+        }
+        for (; i < CX2341X_MBOX_MAX_DATA; i++)
+                mc417_memory_write(dev, dev->cx23417_mailbox + 4 + i, 0);
+
+        flag |= 3; /* tell 'em we're done writing */
+        mc417_memory_write(dev, dev->cx23417_mailbox, flag);
+
+        /* wait for firmware to handle the API command */
+        timeout = jiffies + msecs_to_jiffies(10);
+        for (;;) {
+                mc417_memory_read(dev, dev->cx23417_mailbox, &flag);
+                if (0 != (flag & 4))
+                        break;
+                if (time_after(jiffies, timeout)) {
+                        printk(KERN_ERR "ERROR: API Mailbox timeout\n");
+                        return -1;
+                }
+                udelay(10);
+        }
+
+        /* read output values */
+        for (i = 0; i < out; i++) {
+                mc417_memory_read(dev, dev->cx23417_mailbox + 4 + i, data + i);
+                dprintk(3, "API Output %d = %d\n", i, data[i]);
+        }
+
+        mc417_memory_read(dev, dev->cx23417_mailbox + 2, &retval);
+        dprintk(3, "API result = %d\n", retval);
+
+        flag = 0;
+        mc417_memory_write(dev, dev->cx23417_mailbox, flag);
+
+        return retval;
+}
+
+/* We don't need to call the API often, so using just one
+ * mailbox will probably suffice
+ */
+static int cx23885_api_cmd(struct cx23885_dev *dev,
+                           u32 command,
+                           u32 inputcnt,
+                           u32 outputcnt,
+                           ...)
+{
+        u32 data[CX2341X_MBOX_MAX_DATA];
+        va_list vargs;
+        int i, err;
+
+        dprintk(3, "%s() cmds = 0x%08x\n", __func__, command);
+
+        va_start(vargs, outputcnt);
+        for (i = 0; i < inputcnt; i++)
+                data[i] = va_arg(vargs, int);
+
+        err = cx23885_mbox_func(dev, command, inputcnt, outputcnt, data);
+        for (i = 0; i < outputcnt; i++) {
+                int *vptr = va_arg(vargs, int *);
+                *vptr = data[i];
+        }
+        va_end(vargs);
+
+        return err;
+}
+
+static int cx23885_find_mailbox(struct cx23885_dev *dev)
+{
+        u32 signature[4] = {
+                0x12345678, 0x34567812, 0x56781234, 0x78123456
+        };
+        int signaturecnt = 0;
+        u32 value;
+        int i;
+
+        dprintk(2, "%s()\n", __func__);
+
+        for (i = 0; i < CX23885_FIRM_IMAGE_SIZE; i++) {
+                mc417_memory_read(dev, i, &value);
+                if (value == signature[signaturecnt])
+                        signaturecnt++;
+                else
+                        signaturecnt = 0;
+                if (4 == signaturecnt) {
+                        dprintk(1, "Mailbox signature found at 0x%x\n", i+1);
+                        return i+1;
+                }
+        }
+        printk(KERN_ERR "Mailbox signature values not found!\n");
+        return -1;
+}
+
+static int cx23885_load_firmware(struct cx23885_dev *dev)
+{
+        static const unsigned char magic[8] = {
+                0xa7, 0x0d, 0x00, 0x00, 0x66, 0xbb, 0x55, 0xaa
+        };
+        const struct firmware *firmware;
+        int i, retval = 0;
+        u32 value = 0;
+        u32 gpio_output = 0;
+        u32 checksum = 0;
+        u32 *dataptr;
+
+        dprintk(2, "%s()\n", __func__);
+
+        /* Save GPIO settings before reset of APU */
+        retval |= mc417_memory_read(dev, 0x9020, &gpio_output);
+        retval |= mc417_memory_read(dev, 0x900C, &value);
+
+        retval  = mc417_register_write(dev,
+                IVTV_REG_VPU, 0xFFFFFFED);
+        retval |= mc417_register_write(dev,
+                IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
+        retval |= mc417_register_write(dev,
+                IVTV_REG_ENC_SDRAM_REFRESH, 0x80000800);
+        retval |= mc417_register_write(dev,
+                IVTV_REG_ENC_SDRAM_PRECHARGE, 0x1A);
+        retval |= mc417_register_write(dev,
+                IVTV_REG_APU, 0);
+
+        if (retval != 0) {
+                printk(KERN_ERR "%s: Error with mc417_register_write\n",
+                        __func__);
+                return -1;
+        }
+
+        retval = request_firmware(&firmware, CX23885_FIRM_IMAGE_NAME,
+                                  &dev->pci->dev);
+
+        if (retval != 0) {
+                printk(KERN_ERR
+                        "ERROR: Hotplug firmware request failed (%s).\n",
+                        CX2341X_FIRM_ENC_FILENAME);
+                printk(KERN_ERR "Please fix your hotplug setup, the board will "
+                        "not work without firmware loaded!\n");
+                return -1;
+        }
+
+        if (firmware->size != CX23885_FIRM_IMAGE_SIZE) {
+                printk(KERN_ERR "ERROR: Firmware size mismatch "
+                        "(have %zd, expected %d)\n",
+                        firmware->size, CX23885_FIRM_IMAGE_SIZE);
+                release_firmware(firmware);
+                return -1;
+        }
+
+        if (0 != memcmp(firmware->data, magic, 8)) {
+                printk(KERN_ERR
+                        "ERROR: Firmware magic mismatch, wrong file?\n");
+                release_firmware(firmware);
+                return -1;
+        }
+
+        /* transfer to the chip */
+        dprintk(2, "Loading firmware ...\n");
+        dataptr = (u32 *)firmware->data;
+        for (i = 0; i < (firmware->size >> 2); i++) {
+                value = *dataptr;
+                checksum += ~value;
+                if (mc417_memory_write(dev, i, value) != 0) {
+                        printk(KERN_ERR "ERROR: Loading firmware failed!\n");
+                        release_firmware(firmware);
+                        return -1;
+                }
+                dataptr++;
+        }
+
+        /* read back to verify with the checksum */
+        dprintk(1, "Verifying firmware ...\n");
+        for (i--; i >= 0; i--) {
+                if (mc417_memory_read(dev, i, &value) != 0) {
+                        printk(KERN_ERR "ERROR: Reading firmware failed!\n");
+                        release_firmware(firmware);
+                        return -1;
+                }
+                checksum -= ~value;
+        }
+        if (checksum) {
+                printk(KERN_ERR
+                        "ERROR: Firmware load failed (checksum mismatch).\n");
+                release_firmware(firmware);
+                return -1;
+        }
+        release_firmware(firmware);
+        dprintk(1, "Firmware upload successful.\n");
+
+        retval |= mc417_register_write(dev, IVTV_REG_HW_BLOCKS,
+                IVTV_CMD_HW_BLOCKS_RST);
+
+        /* Restore GPIO settings, make sure EIO14 is enabled as an output. */
+        dprintk(2, "%s: GPIO output EIO 0-15 was = 0x%x\n",
+                __func__, gpio_output);
+        /* Power-up seems to have GPIOs AFU. This was causing digital side
+         * to fail at power-up. Seems GPIOs should be set to 0x10ff0411 at
+         * power-up.
+         * gpio_output |= (1<<14);
+         */
+        /* Note: GPIO14 is specific to the HVR1800 here */
+        gpio_output = 0x10ff0411 | (1<<14);
+        retval |= mc417_register_write(dev, 0x9020, gpio_output | (1<<14));
+        dprintk(2, "%s: GPIO output EIO 0-15 now = 0x%x\n",
+                __func__, gpio_output);
+
+        dprintk(1, "%s: GPIO value  EIO 0-15 was = 0x%x\n",
+                __func__, value);
+        value |= (1<<14);
+        dprintk(1, "%s: GPIO value  EIO 0-15 now = 0x%x\n",
+                __func__, value);
+        retval |= mc417_register_write(dev, 0x900C, value);
+
+        retval |= mc417_register_read(dev, IVTV_REG_VPU, &value);
+        retval |= mc417_register_write(dev, IVTV_REG_VPU, value & 0xFFFFFFE8);
+
+        if (retval < 0)
+                printk(KERN_ERR "%s: Error with mc417_register_write\n",
+                        __func__);
+        return 0;
+}
+
+void cx23885_417_check_encoder(struct cx23885_dev *dev)
+{
+        u32 status, seq;
+
+        status = seq = 0;
+        cx23885_api_cmd(dev, CX2341X_ENC_GET_SEQ_END, 0, 2, &status, &seq);
+        dprintk(1, "%s() status = %d, seq = %d\n", __func__, status, seq);
+}
+
+static void cx23885_codec_settings(struct cx23885_dev *dev)
+{
+        dprintk(1, "%s()\n", __func__);
+
+        /* assign frame size */
+        cx23885_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,
+                                dev->ts1.height, dev->ts1.width);
+
+        dev->mpeg_params.width = dev->ts1.width;
+        dev->mpeg_params.height = dev->ts1.height;
+        dev->mpeg_params.is_50hz =
+                (dev->encodernorm.id & V4L2_STD_625_50) != 0;
+
+        cx2341x_update(dev, cx23885_mbox_func, NULL, &dev->mpeg_params);
+
+        cx23885_api_cmd(dev, CX2341X_ENC_MISC, 2, 0, 3, 1);
+        cx23885_api_cmd(dev, CX2341X_ENC_MISC, 2, 0, 4, 1);
+}
+
+static int cx23885_initialize_codec(struct cx23885_dev *dev)
+{
+        int version;
+        int retval;
+        u32 i, data[7];
+
+        dprintk(1, "%s()\n", __func__);
+
+        retval = cx23885_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */
+        if (retval < 0) {
+                dprintk(2, "%s() PING OK\n", __func__);
+                retval = cx23885_load_firmware(dev);
+                if (retval < 0) {
+                        printk(KERN_ERR "%s() f/w load failed\n", __func__);
+                        return retval;
+                }
+                dev->cx23417_mailbox = cx23885_find_mailbox(dev);
+                if (dev->cx23417_mailbox < 0) {
+                        printk(KERN_ERR "%s() mailbox < 0, error\n",
+                                __func__);
+                        return -1;
+                }
+                retval = cx23885_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0);
+                if (retval < 0) {
+                        printk(KERN_ERR
+                                "ERROR: cx23417 firmware ping failed!\n");
+                        return -1;
+                }
+                retval = cx23885_api_cmd(dev, CX2341X_ENC_GET_VERSION, 0, 1,
+                        &version);
+                if (retval < 0) {
+                        printk(KERN_ERR "ERROR: cx23417 firmware get encoder :"
+                                "version failed!\n");
+                        return -1;
+                }
+                dprintk(1, "cx23417 firmware version is 0x%08x\n", version);
+                msleep(200);
+        }
+
+        cx23885_codec_settings(dev);
+        msleep(60);
+
+        cx23885_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0,
+                CX23885_FIELD1_SAA7115, CX23885_FIELD2_SAA7115);
+        cx23885_api_cmd(dev, CX2341X_ENC_SET_PLACEHOLDER, 12, 0,
+                CX23885_CUSTOM_EXTENSION_USR_DATA, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0);
+
+        /* Setup to capture VBI */
+        data[0] = 0x0001BD00;
+        data[1] = 1;          /* frames per interrupt */
+        data[2] = 4;          /* total bufs */
+        data[3] = 0x91559155; /* start codes */
+        data[4] = 0x206080C0; /* stop codes */
+        data[5] = 6;          /* lines */
+        data[6] = 64;         /* BPL */
+
+        cx23885_api_cmd(dev, CX2341X_ENC_SET_VBI_CONFIG, 7, 0, data[0], data[1],
+                data[2], data[3], data[4], data[5], data[6]);
+
+        for (i = 2; i <= 24; i++) {
+                int valid;
+
+                valid = ((i >= 19) && (i <= 21));
+                cx23885_api_cmd(dev, CX2341X_ENC_SET_VBI_LINE, 5, 0, i,
+                                valid, 0 , 0, 0);
+                cx23885_api_cmd(dev, CX2341X_ENC_SET_VBI_LINE, 5, 0,
+                                i | 0x80000000, valid, 0, 0, 0);
+        }
+
+        cx23885_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, CX23885_UNMUTE);
+        msleep(60);
+
+        /* initialize the video input */
+        cx23885_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0);
+        msleep(60);
+
+        /* Enable VIP style pixel invalidation so we work with scaled mode */
+        mc417_memory_write(dev, 2120, 0x00000080);
+
+        /* start capturing to the host interface */
+        cx23885_api_cmd(dev, CX2341X_ENC_START_CAPTURE, 2, 0,
+                CX23885_MPEG_CAPTURE, CX23885_RAW_BITS_NONE);
+        msleep(10);
+
+        return 0;
+}
+
+/* ------------------------------------------------------------------ */
+
+static int bb_buf_setup(struct videobuf_queue *q,
+        unsigned int *count, unsigned int *size)
+{
+        struct cx23885_fh *fh = q->priv_data;
+
+        fh->dev->ts1.ts_packet_size  = mpeglinesize;
+        fh->dev->ts1.ts_packet_count = mpeglines;
+
+        *size = fh->dev->ts1.ts_packet_size * fh->dev->ts1.ts_packet_count;
+        *count = mpegbufs;
+
+        return 0;
+}
+
+static int bb_buf_prepare(struct videobuf_queue *q,
+        struct videobuf_buffer *vb, enum v4l2_field field)
+{
+        struct cx23885_fh *fh = q->priv_data;
+        return cx23885_buf_prepare(q, &fh->dev->ts1,
+                (struct cx23885_buffer *)vb,
+                field);
+}
+
+static void bb_buf_queue(struct videobuf_queue *q,
+        struct videobuf_buffer *vb)
+{
+        struct cx23885_fh *fh = q->priv_data;
+        cx23885_buf_queue(&fh->dev->ts1, (struct cx23885_buffer *)vb);
+}
+
+static void bb_buf_release(struct videobuf_queue *q,
+        struct videobuf_buffer *vb)
+{
+        cx23885_free_buffer(q, (struct cx23885_buffer *)vb);
+}
+
+static struct videobuf_queue_ops cx23885_qops = {
+        .buf_setup    = bb_buf_setup,
+        .buf_prepare  = bb_buf_prepare,
+        .buf_queue    = bb_buf_queue,
+        .buf_release  = bb_buf_release,
+};
+
+/* ------------------------------------------------------------------ */
+
+static const u32 *ctrl_classes[] = {
+        cx2341x_mpeg_ctrls,
+        NULL
+};
+
+static int cx23885_queryctrl(struct cx23885_dev *dev,
+        struct v4l2_queryctrl *qctrl)
+{
+        qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id);
+        if (qctrl->id == 0)
+                return -EINVAL;
+
+        /* MPEG V4L2 controls */
+        if (cx2341x_ctrl_query(&dev->mpeg_params, qctrl))
+                qctrl->flags |= V4L2_CTRL_FLAG_DISABLED;
+
+        return 0;
+}
+
+static int cx23885_querymenu(struct cx23885_dev *dev,
+        struct v4l2_querymenu *qmenu)
+{
+        struct v4l2_queryctrl qctrl;
+
+        qctrl.id = qmenu->id;
+        cx23885_queryctrl(dev, &qctrl);
+        return v4l2_ctrl_query_menu(qmenu, &qctrl,
+                cx2341x_ctrl_get_menu(qmenu->id));
+}
+
+int cx23885_do_ioctl(struct inode *inode, struct file *file, int radio,
+        struct cx23885_dev *dev, unsigned int cmd, void *arg,
+        v4l2_kioctl driver_ioctl)
+{
+        int err;
+
+        switch (cmd) {
+        /* ---------- tv norms ---------- */
+        case VIDIOC_ENUMSTD:
+        {
+                struct v4l2_standard *e = arg;
+                unsigned int i;
+
+                i = e->index;
+                if (i >= ARRAY_SIZE(cx23885_tvnorms))
+                        return -EINVAL;
+                err = v4l2_video_std_construct(e,
+                        cx23885_tvnorms[e->index].id,
+                        cx23885_tvnorms[e->index].name);
+                e->index = i;
+                if (err < 0)
+                        return err;
+                return 0;
+        }
+        case VIDIOC_G_STD:
+        {
+                v4l2_std_id *id = arg;
+
+                *id = dev->encodernorm.id;
+                return 0;
+        }
+        case VIDIOC_S_STD:
+        {
+                v4l2_std_id *id = arg;
+                unsigned int i;
+
+                for (i = 0; i < ARRAY_SIZE(cx23885_tvnorms); i++)
+                        if (*id & cx23885_tvnorms[i].id)
+                                break;
+                if (i == ARRAY_SIZE(cx23885_tvnorms))
+                        return -EINVAL;
+                dev->encodernorm = cx23885_tvnorms[i];
+
+                return 0;
+        }
+
+        /* ------ input switching ---------- */
+        case VIDIOC_ENUMINPUT:
+        {
+                struct cx23885_input *input;
+                struct v4l2_input *i = arg;
+                unsigned int n;
+
+                n = i->index;
+                if (n >= 4)
+                        return -EINVAL;
+                input = &cx23885_boards[dev->board].input[n];
+                if (input->type == 0)
+                        return -EINVAL;
+                memset(i, 0, sizeof(*i));
+                i->index = n;
+                /* FIXME
+                 * strcpy(i->name, input->name); */
+                strcpy(i->name, "unset");
+                if (input->type == CX23885_VMUX_TELEVISION ||
+                    input->type == CX23885_VMUX_CABLE)
+                        i->type = V4L2_INPUT_TYPE_TUNER;
+                else
+                        i->type  = V4L2_INPUT_TYPE_CAMERA;
+
+                for (n = 0; n < ARRAY_SIZE(cx23885_tvnorms); n++)
+                        i->std |= cx23885_tvnorms[n].id;
+                return 0;
+        }
+        case VIDIOC_G_INPUT:
+        {
+                unsigned int *i = arg;
+
+                *i = dev->input;
+                return 0;
+        }
+        case VIDIOC_S_INPUT:
+        {
+                unsigned int *i = arg;
+
+                if (*i >= 4)
+                        return -EINVAL;
+
+                return 0;
+        }
+
+        /* --- tuner ioctls ------------------------------------------ */
+        case VIDIOC_G_TUNER:
+        {
+                struct v4l2_tuner *t = arg;
+
+                if (UNSET == dev->tuner_type)
+                        return -EINVAL;
+                if (0 != t->index)
+                        return -EINVAL;
+                memset(t, 0, sizeof(*t));
+                strcpy(t->name, "Television");
+                cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_TUNER, t);
+                cx23885_call_i2c_clients(&dev->i2c_bus[1], VIDIOC_G_TUNER, t);
+
+                dprintk(1, "VIDIOC_G_TUNER: tuner type %d\n", t->type);
+
+                return 0;
+        }
+        case VIDIOC_S_TUNER:
+        {
+                struct v4l2_tuner *t = arg;
+
+                if (UNSET == dev->tuner_type)
+                        return -EINVAL;
+
+                /* Update the A/V core */
+                cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_TUNER, t);
+
+                return 0;
+        }
+        case VIDIOC_G_FREQUENCY:
+        {
+                struct v4l2_frequency *f = arg;
+
+                memset(f, 0, sizeof(*f));
+                if (UNSET == dev->tuner_type)
+                        return -EINVAL;
+                f->type = V4L2_TUNER_ANALOG_TV;
+                f->frequency = dev->freq;
+
+                /* Assumption that tuner is always on bus 1 */
+                cx23885_call_i2c_clients(&dev->i2c_bus[1],
+                        VIDIOC_G_FREQUENCY, f);
+
+                return 0;
+        }
+        case VIDIOC_S_FREQUENCY:
+        {
+                struct v4l2_frequency *f = arg;
+
+                dprintk(1, "VIDIOC_S_FREQUENCY: dev type %d, f\n",
+                        dev->tuner_type);
+                dprintk(1, "VIDIOC_S_FREQUENCY: f tuner %d, f type %d\n",
+                        f->tuner, f->type);
+                if (UNSET == dev->tuner_type)
+                        return -EINVAL;
+                if (f->tuner != 0)
+                        return -EINVAL;
+                if (f->type != V4L2_TUNER_ANALOG_TV)
+                        return -EINVAL;
+                dev->freq = f->frequency;
+
+                /* Assumption that tuner is always on bus 1 */
+                cx23885_call_i2c_clients(&dev->i2c_bus[1],
+                        VIDIOC_S_FREQUENCY, f);
+                return 0;
+        }
+        case VIDIOC_S_CTRL:
+        {
+                /* Update the A/V core */
+                cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_CTRL, arg);
+                return 0;
+        }
+        default:
+                /* Convert V4L ioctl to V4L2 and call mpeg_do_ioctl
+                 * (driver_ioctl) */
+                return v4l_compat_translate_ioctl(inode, file, cmd, arg,
+                                                  driver_ioctl);
+        }
+
+        return 0;
+}
+
+static int mpeg_do_ioctl(struct inode *inode, struct file *file,
+                         unsigned int cmd, void *arg)
+{
+        struct cx23885_fh  *fh  = file->private_data;
+        struct cx23885_dev *dev = fh->dev;
+        struct cx23885_tsport  *tsport = &dev->ts1;
+
+        if (v4l_debug > 1)
+                v4l_print_ioctl(dev->name, cmd);
+
+        switch (cmd) {
+
+        /* --- capabilities ------------------------------------------ */
+        case VIDIOC_QUERYCAP:
+        {
+                struct v4l2_capability *cap = arg;
+
+                memset(cap, 0, sizeof(*cap));
+                strcpy(cap->driver, dev->name);
+                strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,
+                        sizeof(cap->card));
+                sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
+                cap->version = CX23885_VERSION_CODE;
+                cap->capabilities =
+                        V4L2_CAP_VIDEO_CAPTURE |
+                        V4L2_CAP_READWRITE     |
+                        V4L2_CAP_STREAMING     |
+                        0;
+                if (UNSET != dev->tuner_type)
+                        cap->capabilities |= V4L2_CAP_TUNER;
+
+                return 0;
+        }
+
+        /* --- capture ioctls ---------------------------------------- */
+        case VIDIOC_ENUM_FMT:
+        {
+                struct v4l2_fmtdesc *f = arg;
+                int index;
+
+                index = f->index;
+                if (index != 0)
+                        return -EINVAL;
+
+                memset(f, 0, sizeof(*f));
+                f->index = index;
+                strlcpy(f->description, "MPEG", sizeof(f->description));
+                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                f->pixelformat = V4L2_PIX_FMT_MPEG;
+                return 0;
+        }
+        case VIDIOC_G_FMT:
+        {
+                struct v4l2_format *f = arg;
+
+                memset(f, 0, sizeof(*f));
+                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+                f->fmt.pix.bytesperline = 0;
+                f->fmt.pix.sizeimage    =
+                        dev->ts1.ts_packet_size * dev->ts1.ts_packet_count;
+                f->fmt.pix.colorspace   = 0;
+                f->fmt.pix.width        = dev->ts1.width;
+                f->fmt.pix.height       = dev->ts1.height;
+                f->fmt.pix.field        = fh->mpegq.field;
+                dprintk(1, "VIDIOC_G_FMT: w: %d, h: %d, f: %d\n",
+                        dev->ts1.width, dev->ts1.height, fh->mpegq.field);
+                return 0;
+        }
+        case VIDIOC_TRY_FMT:
+        {
+                struct v4l2_format *f = arg;
+
+                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+                f->fmt.pix.bytesperline = 0;
+                f->fmt.pix.sizeimage    =
+                        dev->ts1.ts_packet_size * dev->ts1.ts_packet_count;
+                f->fmt.pix.sizeimage    =
+                f->fmt.pix.colorspace   = 0;
+                dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
+                        dev->ts1.width, dev->ts1.height, fh->mpegq.field);
+                return 0;
+        }
+        case VIDIOC_S_FMT:
+        {
+                struct v4l2_format *f = arg;
+
+                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+                f->fmt.pix.bytesperline = 0;
+                f->fmt.pix.sizeimage    =
+                        dev->ts1.ts_packet_size * dev->ts1.ts_packet_count;
+                f->fmt.pix.colorspace   = 0;
+                dprintk(1, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
+                        f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
+                return 0;
+        }
+
+        /* --- streaming capture ------------------------------------- */
+        case VIDIOC_REQBUFS:
+                return videobuf_reqbufs(&fh->mpegq, arg);
+
+        case VIDIOC_QUERYBUF:
+                return videobuf_querybuf(&fh->mpegq, arg);
+
+        case VIDIOC_QBUF:
+                return videobuf_qbuf(&fh->mpegq, arg);
+
+        case VIDIOC_DQBUF:
+                return videobuf_dqbuf(&fh->mpegq, arg,
+                                      file->f_flags & O_NONBLOCK);
+
+        case VIDIOC_STREAMON:
+                return videobuf_streamon(&fh->mpegq);
+
+        case VIDIOC_STREAMOFF:
+                return videobuf_streamoff(&fh->mpegq);
+
+        case VIDIOC_G_EXT_CTRLS:
+        {
+                struct v4l2_ext_controls *f = arg;
+
+                if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
+                        return -EINVAL;
+                return cx2341x_ext_ctrls(&dev->mpeg_params, 0, f, cmd);
+        }
+        case VIDIOC_S_EXT_CTRLS:
+        case VIDIOC_TRY_EXT_CTRLS:
+        {
+                struct v4l2_ext_controls *f = arg;
+                struct cx2341x_mpeg_params p;
+                int err;
+
+                if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
+                        return -EINVAL;
+                p = dev->mpeg_params;
+                err = cx2341x_ext_ctrls(&p, 0, f, cmd);
+                if (err == 0 && cmd == VIDIOC_S_EXT_CTRLS) {
+                        err = cx2341x_update(dev, cx23885_mbox_func,
+                                &dev->mpeg_params, &p);
+                        dev->mpeg_params = p;
+                }
+                return err;
+        }
+        case VIDIOC_S_FREQUENCY:
+        {
+                cx23885_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
+                        CX23885_END_NOW, CX23885_MPEG_CAPTURE,
+                        CX23885_RAW_BITS_NONE);
+                cx23885_do_ioctl(inode, file, 0, dev, cmd, arg,
+                        mpeg_do_ioctl);
+                cx23885_initialize_codec(dev);
+
+                return 0;
+        }
+        case VIDIOC_LOG_STATUS:
+        {
+                char name[32 + 2];
+
+                snprintf(name, sizeof(name), "%s/2", dev->name);
+                printk(KERN_INFO
+                        "%s/2: ============  START LOG STATUS  ============\n",
+                       dev->name);
+                cx23885_call_i2c_clients(&dev->i2c_bus[0], VIDIOC_LOG_STATUS,
+                        NULL);
+                cx23885_call_i2c_clients(&dev->i2c_bus[1], VIDIOC_LOG_STATUS,
+                        NULL);
+                cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_LOG_STATUS,
+                        NULL);
+                cx2341x_log_status(&dev->mpeg_params, name);
+                printk(KERN_INFO
+                        "%s/2: =============  END LOG STATUS  =============\n",
+                       dev->name);
+                return 0;
+        }
+        case VIDIOC_QUERYMENU:
+                return cx23885_querymenu(dev, arg);
+        case VIDIOC_QUERYCTRL:
+        {
+                struct v4l2_queryctrl *c = arg;
+
+                return cx23885_queryctrl(dev, c);
+        }
+
+        default:
+                return cx23885_do_ioctl(inode, file, 0, dev, cmd, arg,
+                                mpeg_do_ioctl);
+        }
+        return 0;
+}
+
+static int mpeg_ioctl(struct inode *inode, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        return video_usercopy(inode, file, cmd, arg, mpeg_do_ioctl);
+}
+
+static int mpeg_open(struct inode *inode, struct file *file)
+{
+        int minor = iminor(inode);
+        struct cx23885_dev *h, *dev = NULL;
+        struct list_head *list;
+        struct cx23885_fh *fh;
+
+        dprintk(2, "%s()\n", __func__);
+
+        list_for_each(list, &cx23885_devlist) {
+                h = list_entry(list, struct cx23885_dev, devlist);
+                if (h->v4l_device->minor == minor) {
+                        dev = h;
+                        break;
+                }
+        }
+
+        if (dev == NULL)
+                return -ENODEV;
+
+        /* allocate + initialize per filehandle data */
+        fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+        if (NULL == fh)
+                return -ENOMEM;
+
+        file->private_data = fh;
+        fh->dev      = dev;
+
+        videobuf_queue_sg_init(&fh->mpegq, &cx23885_qops,
+                            &dev->pci->dev, &dev->ts1.slock,
+                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                            V4L2_FIELD_INTERLACED,
+                            sizeof(struct cx23885_buffer),
+                            fh);
+
+        return 0;
+}
+
+static int mpeg_release(struct inode *inode, struct file *file)
+{
+        struct cx23885_fh  *fh  = file->private_data;
+        struct cx23885_dev *dev = fh->dev;
+
+        dprintk(2, "%s()\n", __func__);
+
+        /* FIXME: Review this crap */
+        /* Shut device down on last close */
+        if (atomic_cmpxchg(&fh->v4l_reading, 1, 0) == 1) {
+                if (atomic_dec_return(&dev->v4l_reader_count) == 0) {
+                        /* stop mpeg capture */
+                        cx23885_api_cmd(fh->dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,
+                                CX23885_END_NOW, CX23885_MPEG_CAPTURE,
+                                CX23885_RAW_BITS_NONE);
+
+                        msleep(500);
+                        cx23885_417_check_encoder(dev);
+
+                        cx23885_cancel_buffers(&fh->dev->ts1);
+                }
+        }
+
+        if (fh->mpegq.streaming)
+                videobuf_streamoff(&fh->mpegq);
+        if (fh->mpegq.reading)
+                videobuf_read_stop(&fh->mpegq);
+
+        videobuf_mmap_free(&fh->mpegq);
+        file->private_data = NULL;
+        kfree(fh);
+
+        return 0;
+}
+
+static ssize_t mpeg_read(struct file *file, char __user *data,
+        size_t count, loff_t *ppos)
+{
+        struct cx23885_fh *fh = file->private_data;
+        struct cx23885_dev *dev = fh->dev;
+
+        dprintk(2, "%s()\n", __func__);
+
+        /* Deal w/ A/V decoder * and mpeg encoder sync issues. */
+        /* Start mpeg encoder on first read. */
+        if (atomic_cmpxchg(&fh->v4l_reading, 0, 1) == 0) {
+                if (atomic_inc_return(&dev->v4l_reader_count) == 1) {
+                        if (cx23885_initialize_codec(dev) < 0)
+                                return -EINVAL;
+                }
+        }
+
+        return videobuf_read_stream(&fh->mpegq, data, count, ppos, 0,
+                                    file->f_flags & O_NONBLOCK);
+}
+
+static unsigned int mpeg_poll(struct file *file,
+        struct poll_table_struct *wait)
+{
+        struct cx23885_fh *fh = file->private_data;
+        struct cx23885_dev *dev = fh->dev;
+
+        dprintk(2, "%s\n", __func__);
+
+        return videobuf_poll_stream(file, &fh->mpegq, wait);
+}
+
+static int mpeg_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct cx23885_fh *fh = file->private_data;
+        struct cx23885_dev *dev = fh->dev;
+
+        dprintk(2, "%s()\n", __func__);
+
+        return videobuf_mmap_mapper(&fh->mpegq, vma);
+}
+
+static struct file_operations mpeg_fops = {
+        .owner         = THIS_MODULE,
+        .open          = mpeg_open,
+        .release       = mpeg_release,
+        .read          = mpeg_read,
+        .poll          = mpeg_poll,
+        .mmap          = mpeg_mmap,
+        .ioctl         = mpeg_ioctl,
+        .llseek        = no_llseek,
+};
+
+static struct video_device cx23885_mpeg_template = {
+        .name          = "cx23885",
+        .type          = VID_TYPE_CAPTURE |
+                                VID_TYPE_TUNER |
+                                VID_TYPE_SCALES |
+                                VID_TYPE_MPEG_ENCODER,
+        .fops          = &mpeg_fops,
+        .minor         = -1,
+};
+
+void cx23885_417_unregister(struct cx23885_dev *dev)
+{
+        dprintk(1, "%s()\n", __func__);
+
+        if (dev->v4l_device) {
+                if (-1 != dev->v4l_device->minor)
+                        video_unregister_device(dev->v4l_device);
+                else
+                        video_device_release(dev->v4l_device);
+                dev->v4l_device = NULL;
+        }
+}
+
+static struct video_device *cx23885_video_dev_alloc(
+        struct cx23885_tsport *tsport,
+        struct pci_dev *pci,
+        struct video_device *template,
+        char *type)
+{
+        struct video_device *vfd;
+        struct cx23885_dev *dev = tsport->dev;
+
+        dprintk(1, "%s()\n", __func__);
+
+        vfd = video_device_alloc();
+        if (NULL == vfd)
+                return NULL;
+        *vfd = *template;
+        vfd->minor   = -1;
+        snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name,
+                type, cx23885_boards[tsport->dev->board].name);
+        vfd->dev     = &pci->dev;
+        vfd->release = video_device_release;
+        return vfd;
+}
+
+int cx23885_417_register(struct cx23885_dev *dev)
+{
+        /* FIXME: Port1 hardcoded here */
+        int err = -ENODEV;
+        struct cx23885_tsport *tsport = &dev->ts1;
+
+        dprintk(1, "%s()\n", __func__);
+
+        if (cx23885_boards[dev->board].portb != CX23885_MPEG_ENCODER)
+                return err;
+
+        /* Set default TV standard */
+        dev->encodernorm = cx23885_tvnorms[0];
+
+        if (dev->encodernorm.id & V4L2_STD_525_60)
+                tsport->height = 480;
+        else
+                tsport->height = 576;
+
+        tsport->width = 720;
+        cx2341x_fill_defaults(&dev->mpeg_params);
+
+        dev->mpeg_params.port = CX2341X_PORT_SERIAL;
+
+        /* Allocate and initialize V4L video device */
+        dev->v4l_device = cx23885_video_dev_alloc(tsport,
+                dev->pci, &cx23885_mpeg_template, "mpeg");
+        err = video_register_device(dev->v4l_device,
+                VFL_TYPE_GRABBER, -1);
+        if (err < 0) {
+                printk(KERN_INFO "%s: can't register mpeg device\n", dev->name);
+                return err;
+        }
+
+        /* Initialize MC417 registers */
+        cx23885_mc417_init(dev);
+
+        printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
+               dev->name, dev->v4l_device->minor & 0x1f);
+
+        return 0;
+}
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index dfa269838e01..6ebf58724a01 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -73,6 +73,7 @@ struct cx23885_board cx23885_boards[] = {
         [CX23885_BOARD_HAUPPAUGE_HVR1800] = {
                 .name           = "Hauppauge WinTV-HVR1800",
                 .porta          = CX23885_ANALOG_VIDEO,
+                .portb          = CX23885_MPEG_ENCODER,
                 .portc          = CX23885_MPEG_DVB,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .tuner_addr     = 0x42, /* 0x84 >> 1 */
@@ -130,6 +131,18 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Hauppauge WinTV-HVR1500",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_HAUPPAUGE_HVR1200] = {
+                .name           = "Hauppauge WinTV-HVR1200",
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_HAUPPAUGE_HVR1700] = {
+                .name           = "Hauppauge WinTV-HVR1700",
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_HAUPPAUGE_HVR1400] = {
+                .name           = "Hauppauge WinTV-HVR1400",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -181,6 +194,18 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x7717,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x71d1,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1200,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x8101,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1700,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x8010,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1400,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -235,6 +260,12 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         case 79561: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */
         case 79571: /* WinTV-HVR1250 (PCIe, OEM, No IR, full height, ATSC and Basic analog */
         case 79671: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */
+        case 80019:
+                /* WinTV-HVR1400 (Express Card, Retail, IR,
+                 * DVB-T and Basic analog */
+        case 81519:
+                /* WinTV-HVR1700 (PCIe, Retail, No IR, half height,
+                 * DVB-T and MPEG2 HW Encoder */
                 break;
         default:
                 printk("%s: warning: unknown hauppauge model #%d\n", dev->name, tv.model);
@@ -264,7 +295,7 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
                 }
                 else {
                         printk(KERN_ERR
-                                "%s(): Unknow command.\n", __FUNCTION__);
+                                "%s(): Unknow command.\n", __func__);
                         return -EINVAL;
                 }
                 break;
@@ -306,6 +337,10 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 /* GPIO-15-18 cx23417 READY, CS, RD, WR */
                 /* GPIO-19 IR_RX */
 
+                /* CX23417 GPIO's */
+                /* EIO15 Zilog Reset */
+                /* EIO14 S5H1409/CX24227 Reset */
+
                 /* Force the TDA8295A into reset and back */
                 cx_set(GP0_IO, 0x00040004);
                 mdelay(20);
@@ -314,6 +349,50 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x00040004);
                 mdelay(20);
                 break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1200:
+                /* GPIO-0 tda10048 demodulator reset */
+                /* GPIO-2 tda18271 tuner reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00050000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000005);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00050005);
+                break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+                /* GPIO-0 TDA10048 demodulator reset */
+                /* GPIO-2 TDA8295A Reset */
+                /* GPIO-3-10 cx23417 data0-7 */
+                /* GPIO-11-14 cx23417 addr0-3 */
+                /* GPIO-15-18 cx23417 READY, CS, RD, WR */
+
+                /* The following GPIO's are on the interna AVCore (cx25840) */
+                /* GPIO-19 IR_RX */
+                /* GPIO-20 IR_TX 416/DVBT Select */
+                /* GPIO-21 IIS DAT */
+                /* GPIO-22 IIS WCLK */
+                /* GPIO-23 IIS BCLK */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00050000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000005);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00050005);
+                break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+                /* GPIO-0  Dibcom7000p demodulator reset */
+                /* GPIO-2  xc3028L tuner reset */
+                /* GPIO-13 LED */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00050000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000005);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00050005);
+                break;
         }
 }
 
@@ -324,6 +403,8 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
+        case CX23885_BOARD_HAUPPAUGE_HVR1200:
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
                 /* FIXME: Implement me */
                 break;
         }
@@ -348,11 +429,14 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
                 if (dev->i2c_bus[0].i2c_rc == 0)
                         hauppauge_eeprom(dev, eeprom+0x80);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+        case CX23885_BOARD_HAUPPAUGE_HVR1200:
+        case CX23885_BOARD_HAUPPAUGE_HVR1700:
                 if (dev->i2c_bus[0].i2c_rc == 0)
                         hauppauge_eeprom(dev, eeprom+0xc0);
                 break;
@@ -364,17 +448,45 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1800:
+                /* Defaults for VID B - Analog encoder */
+                /* DREQ_POL, SMODE, PUNC_CLK, MCLK_POL Serial bus + punc clk */
+                ts1->gen_ctrl_val    = 0x10e;
+                ts1->ts_clk_en_val   = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val     = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+
+                /* APB_TSVALERR_POL (active low)*/
+                ts1->vld_misc_val    = 0x2000;
+                ts1->hw_sop_ctrl_val = (0x47 << 16 | 188 << 4 | 0xc);
+
+                /* Defaults for VID C */
+                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-        case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+        case CX23885_BOARD_HAUPPAUGE_HVR1200:
+        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
         }
 
+        /* Certain boards support analog, or require the avcore to be
+         * loaded, ensure this happens.
+         */
+        switch (dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1800:
+        case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+                request_module("cx25840");
+                break;
+        }
 }
 
 /* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 7f10b273598f..f24abcd06dea 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -190,25 +190,25 @@ static struct sram_channel cx23887_sram_channels[] = {
 static int cx23885_risc_decode(u32 risc)
 {
         static char *instr[16] = {
-                [ RISC_SYNC    >> 28 ] = "sync",
-                [ RISC_WRITE   >> 28 ] = "write",
-                [ RISC_WRITEC  >> 28 ] = "writec",
-                [ RISC_READ    >> 28 ] = "read",
-                [ RISC_READC   >> 28 ] = "readc",
-                [ RISC_JUMP    >> 28 ] = "jump",
-                [ RISC_SKIP    >> 28 ] = "skip",
-                [ RISC_WRITERM >> 28 ] = "writerm",
-                [ RISC_WRITECM >> 28 ] = "writecm",
-                [ RISC_WRITECR >> 28 ] = "writecr",
+                [RISC_SYNC    >> 28] = "sync",
+                [RISC_WRITE   >> 28] = "write",
+                [RISC_WRITEC  >> 28] = "writec",
+                [RISC_READ    >> 28] = "read",
+                [RISC_READC   >> 28] = "readc",
+                [RISC_JUMP    >> 28] = "jump",
+                [RISC_SKIP    >> 28] = "skip",
+                [RISC_WRITERM >> 28] = "writerm",
+                [RISC_WRITECM >> 28] = "writecm",
+                [RISC_WRITECR >> 28] = "writecr",
         };
         static int incr[16] = {
-                [ RISC_WRITE   >> 28 ] = 3,
-                [ RISC_JUMP    >> 28 ] = 3,
-                [ RISC_SKIP    >> 28 ] = 1,
-                [ RISC_SYNC    >> 28 ] = 1,
-                [ RISC_WRITERM >> 28 ] = 3,
-                [ RISC_WRITECM >> 28 ] = 3,
-                [ RISC_WRITECR >> 28 ] = 4,
+                [RISC_WRITE   >> 28] = 3,
+                [RISC_JUMP    >> 28] = 3,
+                [RISC_SKIP    >> 28] = 1,
+                [RISC_SYNC    >> 28] = 1,
+                [RISC_WRITERM >> 28] = 3,
+                [RISC_WRITECM >> 28] = 3,
+                [RISC_WRITECR >> 28] = 4,
         };
         static char *bits[] = {
                 "12",   "13",   "14",   "resync",
@@ -260,7 +260,7 @@ void cx23885_wakeup(struct cx23885_tsport *port,
         }
         if (bc != 1)
                 printk("%s: %d buffers handled (should be 1)\n",
-                       __FUNCTION__, bc);
+                       __func__, bc);
 }
 
 int cx23885_sram_channel_setup(struct cx23885_dev *dev,
@@ -272,7 +272,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 
         if (ch->cmds_start == 0)
         {
-                dprintk(1, "%s() Erasing channel [%s]\n", __FUNCTION__,
+                dprintk(1, "%s() Erasing channel [%s]\n", __func__,
                         ch->name);
                 cx_write(ch->ptr1_reg, 0);
                 cx_write(ch->ptr2_reg, 0);
@@ -280,7 +280,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
                 cx_write(ch->cnt1_reg, 0);
                 return 0;
         } else {
-                dprintk(1, "%s() Configuring channel [%s]\n", __FUNCTION__,
+                dprintk(1, "%s() Configuring channel [%s]\n", __func__,
                         ch->name);
         }
 
@@ -297,7 +297,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 
         /* write CDT */
         for (i = 0; i < lines; i++) {
-                dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
+                dprintk(2, "%s() 0x%08x <- 0x%08x\n", __func__, cdt + 16*i,
                         ch->fifo_start + bpl*i);
                 cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
                 cx_write(cdt + 16*i +  4, 0);
@@ -449,7 +449,7 @@ static void cx23885_shutdown(struct cx23885_dev *dev)
 
 static void cx23885_reset(struct cx23885_dev *dev)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         cx23885_shutdown(dev);
 
@@ -482,7 +482,7 @@ static void cx23885_reset(struct cx23885_dev *dev)
 
 static int cx23885_pci_quirks(struct cx23885_dev *dev)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         /* The cx23885 bridge has a weird bug which causes NMI to be asserted
          * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not
@@ -513,11 +513,13 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 
 static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)
 {
-        dprintk(1, "%s(portno=%d)\n", __FUNCTION__, portno);
+        dprintk(1, "%s(portno=%d)\n", __func__, portno);
 
         /* Transport bus init dma queue  - Common settings */
         port->dma_ctl_val        = 0x11; /* Enable RISC controller and Fifo */
         port->ts_int_msk_val     = 0x1111; /* TS port bits for RISC */
+        port->vld_misc_val       = 0x0;
+        port->hw_sop_ctrl_val    = (0x47 << 16 | 188 << 4);
 
         spin_lock_init(&port->slock);
         port->dev = dev;
@@ -544,7 +546,7 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
                 port->reg_ts_clk_en      = VID_B_TS_CLK_EN;
                 port->reg_src_sel        = VID_B_SRC_SEL;
                 port->reg_ts_int_msk     = VID_B_INT_MSK;
-                port->reg_ts_int_stat   = VID_B_INT_STAT;
+                port->reg_ts_int_stat    = VID_B_INT_STAT;
                 port->sram_chno          = SRAM_CH03; /* VID_B */
                 port->pci_irqmask        = 0x02; /* VID_B bit1 */
                 break;
@@ -604,14 +606,14 @@ static void cx23885_dev_checkrevision(struct cx23885_dev *dev)
                 break;
         default:
                 printk(KERN_ERR "%s() New hardware revision found 0x%x\n",
-                        __FUNCTION__, dev->hwrevision);
+                        __func__, dev->hwrevision);
         }
         if (dev->hwrevision)
                 printk(KERN_INFO "%s() Hardware revision = 0x%02x\n",
-                        __FUNCTION__, dev->hwrevision);
+                        __func__, dev->hwrevision);
         else
                 printk(KERN_ERR "%s() Hardware revision unknown 0x%x\n",
-                        __FUNCTION__, dev->hwrevision);
+                        __func__, dev->hwrevision);
 }
 
 static int cx23885_dev_setup(struct cx23885_dev *dev)
@@ -644,7 +646,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                 BUG();
 
         dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
-                __FUNCTION__, dev->bridge);
+                __func__, dev->bridge);
 
         /* board config */
         dev->board = UNSET;
@@ -697,10 +699,12 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         dev->i2c_bus[2].reg_wdata = I2C3_WDATA;
         dev->i2c_bus[2].i2c_period = (0x07 << 24); /* 1.95MHz */
 
-        if(cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
+        if ((cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) ||
+                (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER))
                 cx23885_init_tsport(dev, &dev->ts1, 1);
 
-        if(cx23885_boards[dev->board].portc == CX23885_MPEG_DVB)
+        if ((cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) ||
+                (cx23885_boards[dev->board].portc == CX23885_MPEG_ENCODER))
                 cx23885_init_tsport(dev, &dev->ts2, 2);
 
         if (get_resources(dev) < 0) {
@@ -734,9 +738,9 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         dev->radio_addr = cx23885_boards[dev->board].radio_addr;
 
         dprintk(1, "%s() tuner_type = 0x%x tuner_addr = 0x%x\n",
-                __FUNCTION__, dev->tuner_type, dev->tuner_addr);
+                __func__, dev->tuner_type, dev->tuner_addr);
         dprintk(1, "%s() radio_type = 0x%x radio_addr = 0x%x\n",
-                __FUNCTION__, dev->radio_type, dev->radio_addr);
+                __func__, dev->radio_type, dev->radio_addr);
 
         /* init hardware */
         cx23885_reset(dev);
@@ -744,28 +748,43 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         cx23885_i2c_register(&dev->i2c_bus[0]);
         cx23885_i2c_register(&dev->i2c_bus[1]);
         cx23885_i2c_register(&dev->i2c_bus[2]);
-        cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
         cx23885_card_setup(dev);
+        cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
         cx23885_ir_init(dev);
 
         if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
                 if (cx23885_video_register(dev) < 0) {
                         printk(KERN_ERR "%s() Failed to register analog "
-                                "video adapters on VID_A\n", __FUNCTION__);
+                                "video adapters on VID_A\n", __func__);
                 }
         }
 
         if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {
                 if (cx23885_dvb_register(&dev->ts1) < 0) {
                         printk(KERN_ERR "%s() Failed to register dvb adapters on VID_B\n",
-                               __FUNCTION__);
+                               __func__);
+                }
+        } else
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER) {
+                if (cx23885_417_register(dev) < 0) {
+                        printk(KERN_ERR
+                                "%s() Failed to register 417 on VID_B\n",
+                               __func__);
                 }
         }
 
         if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {
                 if (cx23885_dvb_register(&dev->ts2) < 0) {
-                        printk(KERN_ERR "%s() Failed to register dvb adapters on VID_C\n",
-                               __FUNCTION__);
+                        printk(KERN_ERR
+                                "%s() Failed to register dvb on VID_C\n",
+                               __func__);
+                }
+        } else
+        if (cx23885_boards[dev->board].portc == CX23885_MPEG_ENCODER) {
+                if (cx23885_417_register(dev) < 0) {
+                        printk(KERN_ERR
+                                "%s() Failed to register 417 on VID_C\n",
+                               __func__);
                 }
         }
 
@@ -785,12 +804,18 @@ static void cx23885_dev_unregister(struct cx23885_dev *dev)
         if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO)
                 cx23885_video_unregister(dev);
 
-        if(cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
                 cx23885_dvb_unregister(&dev->ts1);
 
-        if(cx23885_boards[dev->board].portc == CX23885_MPEG_DVB)
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER)
+                cx23885_417_unregister(dev);
+
+        if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB)
                 cx23885_dvb_unregister(&dev->ts2);
 
+        if (cx23885_boards[dev->board].portc == CX23885_MPEG_ENCODER)
+                cx23885_417_unregister(dev);
+
         cx23885_i2c_unregister(&dev->i2c_bus[2]);
         cx23885_i2c_unregister(&dev->i2c_bus[1]);
         cx23885_i2c_unregister(&dev->i2c_bus[0]);
@@ -952,7 +977,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
         videobuf_waiton(&buf->vb, 0, 0);
         videobuf_dma_unmap(q, dma);
         videobuf_dma_free(dma);
-        btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
+        btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
         buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
@@ -960,50 +985,50 @@ static void cx23885_tsport_reg_dump(struct cx23885_tsport *port)
 {
         struct cx23885_dev *dev = port->dev;
 
-        dprintk(1, "%s() Register Dump\n", __FUNCTION__);
-        dprintk(1, "%s() DEV_CNTRL2               0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() Register Dump\n", __func__);
+        dprintk(1, "%s() DEV_CNTRL2               0x%08X\n", __func__,
                 cx_read(DEV_CNTRL2));
-        dprintk(1, "%s() PCI_INT_MSK              0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() PCI_INT_MSK              0x%08X\n", __func__,
                 cx_read(PCI_INT_MSK));
-        dprintk(1, "%s() AUD_INT_INT_MSK          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() AUD_INT_INT_MSK          0x%08X\n", __func__,
                 cx_read(AUDIO_INT_INT_MSK));
-        dprintk(1, "%s() AUD_INT_DMA_CTL          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() AUD_INT_DMA_CTL          0x%08X\n", __func__,
                 cx_read(AUD_INT_DMA_CTL));
-        dprintk(1, "%s() AUD_EXT_INT_MSK          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() AUD_EXT_INT_MSK          0x%08X\n", __func__,
                 cx_read(AUDIO_EXT_INT_MSK));
-        dprintk(1, "%s() AUD_EXT_DMA_CTL          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() AUD_EXT_DMA_CTL          0x%08X\n", __func__,
                 cx_read(AUD_EXT_DMA_CTL));
-        dprintk(1, "%s() PAD_CTRL                 0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() PAD_CTRL                 0x%08X\n", __func__,
                 cx_read(PAD_CTRL));
-        dprintk(1, "%s() ALT_PIN_OUT_SEL          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() ALT_PIN_OUT_SEL          0x%08X\n", __func__,
                 cx_read(ALT_PIN_OUT_SEL));
-        dprintk(1, "%s() GPIO2                    0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() GPIO2                    0x%08X\n", __func__,
                 cx_read(GPIO2));
-        dprintk(1, "%s() gpcnt(0x%08X)          0x%08X\n", __FUNCTION__,
+        dprintk(1, "%s() gpcnt(0x%08X)          0x%08X\n", __func__,
                 port->reg_gpcnt, cx_read(port->reg_gpcnt));
-        dprintk(1, "%s() gpcnt_ctl(0x%08X)      0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() gpcnt_ctl(0x%08X)      0x%08x\n", __func__,
                 port->reg_gpcnt_ctl, cx_read(port->reg_gpcnt_ctl));
-        dprintk(1, "%s() dma_ctl(0x%08X)        0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() dma_ctl(0x%08X)        0x%08x\n", __func__,
                 port->reg_dma_ctl, cx_read(port->reg_dma_ctl));
-        dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() src_sel(0x%08X)        0x%08x\n", __func__,
                 port->reg_src_sel, cx_read(port->reg_src_sel));
-        dprintk(1, "%s() lngth(0x%08X)          0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() lngth(0x%08X)          0x%08x\n", __func__,
                 port->reg_lngth, cx_read(port->reg_lngth));
-        dprintk(1, "%s() hw_sop_ctrl(0x%08X)    0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() hw_sop_ctrl(0x%08X)    0x%08x\n", __func__,
                 port->reg_hw_sop_ctrl, cx_read(port->reg_hw_sop_ctrl));
-        dprintk(1, "%s() gen_ctrl(0x%08X)       0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() gen_ctrl(0x%08X)       0x%08x\n", __func__,
                 port->reg_gen_ctrl, cx_read(port->reg_gen_ctrl));
-        dprintk(1, "%s() bd_pkt_status(0x%08X)  0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() bd_pkt_status(0x%08X)  0x%08x\n", __func__,
                 port->reg_bd_pkt_status, cx_read(port->reg_bd_pkt_status));
-        dprintk(1, "%s() sop_status(0x%08X)     0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() sop_status(0x%08X)     0x%08x\n", __func__,
                 port->reg_sop_status, cx_read(port->reg_sop_status));
-        dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __func__,
                 port->reg_fifo_ovfl_stat, cx_read(port->reg_fifo_ovfl_stat));
-        dprintk(1, "%s() vld_misc(0x%08X)       0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() vld_misc(0x%08X)       0x%08x\n", __func__,
                 port->reg_vld_misc, cx_read(port->reg_vld_misc));
-        dprintk(1, "%s() ts_clk_en(0x%08X)      0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() ts_clk_en(0x%08X)      0x%08x\n", __func__,
                 port->reg_ts_clk_en, cx_read(port->reg_ts_clk_en));
-        dprintk(1, "%s() ts_int_msk(0x%08X)     0x%08x\n", __FUNCTION__,
+        dprintk(1, "%s() ts_int_msk(0x%08X)     0x%08x\n", __func__,
                 port->reg_ts_int_msk, cx_read(port->reg_ts_int_msk));
 }
 
@@ -1012,8 +1037,9 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
                              struct cx23885_buffer   *buf)
 {
         struct cx23885_dev *dev = port->dev;
+        u32 reg;
 
-        dprintk(1, "%s() w: %d, h: %d, f: %d\n", __FUNCTION__,
+        dprintk(1, "%s() w: %d, h: %d, f: %d\n", __func__,
                 buf->vb.width, buf->vb.height, buf->vb.field);
 
         /* setup fifo + format */
@@ -1031,21 +1057,24 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
                 (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
                 printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",
-                        __FUNCTION__,
+                        __func__,
                         cx23885_boards[dev->board].portb,
                         cx23885_boards[dev->board].portc );
                 return -EINVAL;
         }
 
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER)
+                cx23885_av_clk(dev, 0);
+
         udelay(100);
 
         /* If the port supports SRC SELECT, configure it */
         if(port->reg_src_sel)
                 cx_write(port->reg_src_sel, port->src_sel_val);
 
-        cx_write(port->reg_hw_sop_ctrl, 0x47 << 16 | 188 << 4);
+        cx_write(port->reg_hw_sop_ctrl, port->hw_sop_ctrl_val);
         cx_write(port->reg_ts_clk_en, port->ts_clk_en_val);
-        cx_write(port->reg_vld_misc, 0x00);
+        cx_write(port->reg_vld_misc, port->vld_misc_val);
         cx_write(port->reg_gen_ctrl, port->gen_ctrl_val);
         udelay(100);
 
@@ -1054,11 +1083,26 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         cx_write(port->reg_gpcnt_ctl, 3);
         q->count = 1;
 
+        if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {
+
+                reg = cx_read(PAD_CTRL);
+                reg = reg & ~0x1;    /* Clear TS1_OE */
+
+                /* FIXME, bit 2 writing here is questionable */
+                /* set TS1_SOP_OE and TS1_OE_HI */
+                reg = reg | 0xa;
+                cx_write(PAD_CTRL, reg);
+
+                /* FIXME and these two registers should be documented. */
+                cx_write(CLK_DELAY, cx_read(CLK_DELAY) | 0x80000011);
+                cx_write(ALT_PIN_OUT_SEL, 0x10100045);
+        }
+
         switch(dev->bridge) {
         case CX23885_BRIDGE_885:
         case CX23885_BRIDGE_887:
                 /* enable irqs */
-                dprintk(1, "%s() enabling TS int's and DMA\n", __FUNCTION__ );
+                dprintk(1, "%s() enabling TS int's and DMA\n", __func__ );
                 cx_set(port->reg_ts_int_msk,  port->ts_int_msk_val);
                 cx_set(port->reg_dma_ctl, port->dma_ctl_val);
                 cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
@@ -1069,6 +1113,9 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 
         cx_set(DEV_CNTRL2, (1<<5)); /* Enable RISC controller */
 
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER)
+                cx23885_av_clk(dev, 1);
+
         if (debug > 4)
                 cx23885_tsport_reg_dump(port);
 
@@ -1078,12 +1125,32 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 static int cx23885_stop_dma(struct cx23885_tsport *port)
 {
         struct cx23885_dev *dev = port->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        u32 reg;
+
+        dprintk(1, "%s()\n", __func__);
 
         /* Stop interrupts and DMA */
         cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);
         cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
 
+        if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {
+
+                reg = cx_read(PAD_CTRL);
+
+                /* Set TS1_OE */
+                reg = reg | 0x1;
+
+                /* clear TS1_SOP_OE and TS1_OE_HI */
+                reg = reg & ~0xa;
+                cx_write(PAD_CTRL, reg);
+                cx_write(port->reg_src_sel, 0);
+                cx_write(port->reg_gen_ctrl, 8);
+
+        }
+
+        if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER)
+                cx23885_av_clk(dev, 0);
+
         return 0;
 }
 
@@ -1093,13 +1160,13 @@ int cx23885_restart_queue(struct cx23885_tsport *port,
         struct cx23885_dev *dev = port->dev;
         struct cx23885_buffer *buf;
 
-        dprintk(5, "%s()\n", __FUNCTION__);
+        dprintk(5, "%s()\n", __func__);
         if (list_empty(&q->active))
         {
                 struct cx23885_buffer *prev;
                 prev = NULL;
 
-                dprintk(5, "%s() queue is empty\n", __FUNCTION__);
+                dprintk(5, "%s() queue is empty\n", __func__);
 
                 for (;;) {
                         if (list_empty(&q->queued))
@@ -1154,7 +1221,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
         int size = port->ts_packet_size * port->ts_packet_count;
         int rc;
 
-        dprintk(1, "%s: %p\n", __FUNCTION__, buf);
+        dprintk(1, "%s: %p\n", __func__, buf);
         if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
                 return -EINVAL;
 
@@ -1197,7 +1264,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                 buf->count    = cx88q->count++;
                 mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
                 dprintk(1, "[%p/%d] %s - first active\n",
-                        buf, buf->vb.i, __FUNCTION__);
+                        buf, buf->vb.i, __func__);
         } else {
                 dprintk( 1, "queue is not empty - append to active\n" );
                 prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
@@ -1208,7 +1275,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
                 dprintk( 1, "[%p/%d] %s - append to active\n",
-                         buf, buf->vb.i, __FUNCTION__);
+                         buf, buf->vb.i, __func__);
         }
 }
 
@@ -1239,13 +1306,23 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
         spin_unlock_irqrestore(&port->slock, flags);
 }
 
+void cx23885_cancel_buffers(struct cx23885_tsport *port)
+{
+        struct cx23885_dev *dev = port->dev;
+        struct cx23885_dmaqueue *q = &port->mpegq;
+
+        dprintk(1, "%s()\n", __FUNCTION__);
+        del_timer_sync(&q->timeout);
+        cx23885_stop_dma(port);
+        do_cancel_buffers(port, "cancel", 0);
+}
 
 static void cx23885_timeout(unsigned long data)
 {
         struct cx23885_tsport *port = (struct cx23885_tsport *)data;
         struct cx23885_dev *dev = port->dev;
 
-        dprintk(1, "%s()\n",__FUNCTION__);
+        dprintk(1, "%s()\n",__func__);
 
         if (debug > 5)
                 cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ]);
@@ -1254,16 +1331,77 @@ static void cx23885_timeout(unsigned long data)
         do_cancel_buffers(port, "timeout", 1);
 }
 
+int cx23885_irq_417(struct cx23885_dev *dev, u32 status)
+{
+        /* FIXME: port1 assumption here. */
+        struct cx23885_tsport *port = &dev->ts1;
+        int count = 0;
+        int handled = 0;
+
+        if (status == 0)
+                return handled;
+
+        count = cx_read(port->reg_gpcnt);
+        dprintk(7, "status: 0x%08x  mask: 0x%08x count: 0x%x\n",
+                status, cx_read(port->reg_ts_int_msk), count);
+
+        if ((status & VID_B_MSK_BAD_PKT)         ||
+                (status & VID_B_MSK_OPC_ERR)     ||
+                (status & VID_B_MSK_VBI_OPC_ERR) ||
+                (status & VID_B_MSK_SYNC)        ||
+                (status & VID_B_MSK_VBI_SYNC)    ||
+                (status & VID_B_MSK_OF)          ||
+                (status & VID_B_MSK_VBI_OF)) {
+                printk(KERN_ERR "%s: V4L mpeg risc op code error, status "
+                        "= 0x%x\n", dev->name, status);
+                if (status & VID_B_MSK_BAD_PKT)
+                        dprintk(1, "        VID_B_MSK_BAD_PKT\n");
+                if (status & VID_B_MSK_OPC_ERR)
+                        dprintk(1, "        VID_B_MSK_OPC_ERR\n");
+                if (status & VID_B_MSK_VBI_OPC_ERR)
+                        dprintk(1, "        VID_B_MSK_VBI_OPC_ERR\n");
+                if (status & VID_B_MSK_SYNC)
+                        dprintk(1, "        VID_B_MSK_SYNC\n");
+                if (status & VID_B_MSK_VBI_SYNC)
+                        dprintk(1, "        VID_B_MSK_VBI_SYNC\n");
+                if (status & VID_B_MSK_OF)
+                        dprintk(1, "        VID_B_MSK_OF\n");
+                if (status & VID_B_MSK_VBI_OF)
+                        dprintk(1, "        VID_B_MSK_VBI_OF\n");
+
+                cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
+                cx23885_sram_channel_dump(dev,
+                        &dev->sram_channels[port->sram_chno]);
+                cx23885_417_check_encoder(dev);
+        } else if (status & VID_B_MSK_RISCI1) {
+                dprintk(7, "        VID_B_MSK_RISCI1\n");
+                spin_lock(&port->slock);
+                cx23885_wakeup(port, &port->mpegq, count);
+                spin_unlock(&port->slock);
+        } else if (status & VID_B_MSK_RISCI2) {
+                dprintk(7, "        VID_B_MSK_RISCI2\n");
+                spin_lock(&port->slock);
+                cx23885_restart_queue(port, &port->mpegq);
+                spin_unlock(&port->slock);
+        }
+        if (status) {
+                cx_write(port->reg_ts_int_stat, status);
+                handled = 1;
+        }
+
+        return handled;
+}
+
 static int cx23885_irq_ts(struct cx23885_tsport *port, u32 status)
 {
         struct cx23885_dev *dev = port->dev;
         int handled = 0;
         u32 count;
 
-        if ( (status & VID_BC_MSK_OPC_ERR) ||
-             (status & VID_BC_MSK_BAD_PKT) ||
-             (status & VID_BC_MSK_SYNC) ||
-             (status & VID_BC_MSK_OF))
+        if ((status & VID_BC_MSK_OPC_ERR) ||
+                (status & VID_BC_MSK_BAD_PKT) ||
+                (status & VID_BC_MSK_SYNC) ||
+                (status & VID_BC_MSK_OF))
         {
                 if (status & VID_BC_MSK_OPC_ERR)
                         dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n", VID_BC_MSK_OPC_ERR);
@@ -1277,7 +1415,8 @@ static int cx23885_irq_ts(struct cx23885_tsport *port, u32 status)
                 printk(KERN_ERR "%s: mpeg risc op code error\n", dev->name);
 
                 cx_clear(port->reg_dma_ctl, port->dma_ctl_val);
-                cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ]);
+                cx23885_sram_channel_dump(dev,
+                        &dev->sram_channels[port->sram_chno]);
 
         } else if (status & VID_BC_MSK_RISCI1) {
 
@@ -1378,11 +1517,17 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
         if (ts1_status) {
                 if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
                         handled += cx23885_irq_ts(ts1, ts1_status);
+                else
+                if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER)
+                        handled += cx23885_irq_417(dev, ts1_status);
         }
 
         if (ts2_status) {
                 if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB)
                         handled += cx23885_irq_ts(ts2, ts2_status);
+                else
+                if (cx23885_boards[dev->board].portc == CX23885_MPEG_ENCODER)
+                        handled += cx23885_irq_417(dev, ts2_status);
         }
 
         if (vida_status)
@@ -1422,7 +1567,8 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
         printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
                "latency: %d, mmio: 0x%llx\n", dev->name,
                pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
-               dev->pci_lat, (unsigned long long)pci_resource_start(pci_dev,0));
+               dev->pci_lat,
+                (unsigned long long)pci_resource_start(pci_dev, 0));
 
         pci_set_master(pci_dev);
         if (!pci_dma_supported(pci_dev, 0xffffffff)) {
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index ed465c007cea..870d6e197d65 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -36,9 +36,12 @@
 #include "tda18271.h"
 #include "lgdt330x.h"
 #include "xc5000.h"
+#include "tda10048.h"
 #include "dvb-pll.h"
 #include "tuner-xc2028.h"
-#include "tuner-xc2028-types.h"
+#include "tuner-simple.h"
+#include "dib7000p.h"
+#include "dibx000_common.h"
 
 static unsigned int debug;
 
@@ -53,6 +56,8 @@ static unsigned int alt_tuner;
 module_param(alt_tuner, int, 0644);
 MODULE_PARM_DESC(alt_tuner, "Enable alternate tuner configuration");
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 /* ------------------------------------------------------------------ */
 
 static int dvb_buf_setup(struct videobuf_queue *q,
@@ -104,6 +109,13 @@ static struct s5h1409_config hauppauge_generic_config = {
         .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
 };
 
+static struct tda10048_config hauppauge_hvr1200_config = {
+        .demod_address    = 0x10 >> 1,
+        .output_mode      = TDA10048_SERIAL_OUTPUT,
+        .fwbulkwritelen   = TDA10048_BULKWRITE_200,
+        .inversion        = TDA10048_INVERSION_ON
+};
+
 static struct s5h1409_config hauppauge_ezqam_config = {
         .demod_address = 0x32 >> 1,
         .output_mode   = S5H1409_SERIAL_OUTPUT,
@@ -164,8 +176,10 @@ static struct tda829x_config tda829x_no_probe = {
 };
 
 static struct tda18271_std_map hauppauge_tda18271_std_map = {
-        .atsc_6   = { .if_freq = 5380, .std_bits = 0x1b },
-        .qam_6    = { .if_freq = 4000, .std_bits = 0x18 },
+        .atsc_6   = { .if_freq = 5380, .agc_mode = 3, .std = 3,
+                      .if_lvl = 6, .rfagc_top = 0x37 },
+        .qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 0,
+                      .if_lvl = 6, .rfagc_top = 0x37 },
 };
 
 static struct tda18271_config hauppauge_tda18271_config = {
@@ -173,6 +187,96 @@ static struct tda18271_config hauppauge_tda18271_config = {
         .gate    = TDA18271_GATE_ANALOG,
 };
 
+static struct tda18271_config hauppauge_hvr1200_tuner_config = {
+        .gate    = TDA18271_GATE_ANALOG,
+};
+
+struct dibx000_agc_config xc3028_agc_config = {
+        BAND_VHF | BAND_UHF,    /* band_caps */
+
+        /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0,
+         * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,
+         * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0,
+         * P_agc_nb_est=2, P_agc_write=0
+         */
+        (0 << 15) | (0 << 14) | (0 << 11) | (0 << 10) | (0 << 9) | (0 << 8) |
+                (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), /* setup */
+
+        712,    /* inv_gain */
+        21,     /* time_stabiliz */
+
+        0,      /* alpha_level */
+        118,    /* thlock */
+
+        0,      /* wbd_inv */
+        2867,   /* wbd_ref */
+        0,      /* wbd_sel */
+        2,      /* wbd_alpha */
+
+        0,      /* agc1_max */
+        0,      /* agc1_min */
+        39718,  /* agc2_max */
+        9930,   /* agc2_min */
+        0,      /* agc1_pt1 */
+        0,      /* agc1_pt2 */
+        0,      /* agc1_pt3 */
+        0,      /* agc1_slope1 */
+        0,      /* agc1_slope2 */
+        0,      /* agc2_pt1 */
+        128,    /* agc2_pt2 */
+        29,     /* agc2_slope1 */
+        29,     /* agc2_slope2 */
+
+        17,     /* alpha_mant */
+        27,     /* alpha_exp */
+        23,     /* beta_mant */
+        51,     /* beta_exp */
+
+        1,      /* perform_agc_softsplit */
+};
+
+/* PLL Configuration for COFDM BW_MHz = 8.000000
+ * With external clock = 30.000000 */
+struct dibx000_bandwidth_config xc3028_bw_config = {
+        60000,  /* internal */
+        30000,  /* sampling */
+        1,      /* pll_cfg: prediv */
+        8,      /* pll_cfg: ratio */
+        3,      /* pll_cfg: range */
+        1,      /* pll_cfg: reset */
+        0,      /* pll_cfg: bypass */
+        0,      /* misc: refdiv */
+        0,      /* misc: bypclk_div */
+        1,      /* misc: IO_CLK_en_core */
+        1,      /* misc: ADClkSrc */
+        0,      /* misc: modulo */
+        (3 << 14) | (1 << 12) | (524 << 0), /* sad_cfg: refsel, sel, freq_15k */
+        (1 << 25) | 5816102, /* ifreq = 5.200000 MHz */
+        20452225, /* timf */
+        30000000  /* xtal_hz */
+};
+
+static struct dib7000p_config hauppauge_hvr1400_dib7000_config = {
+        .output_mpeg2_in_188_bytes = 1,
+        .hostbus_diversity = 1,
+        .tuner_is_baseband = 0,
+        .update_lna  = NULL,
+
+        .agc_config_count = 1,
+        .agc = &xc3028_agc_config,
+        .bw  = &xc3028_bw_config,
+
+        .gpio_dir = DIB7000P_GPIO_DEFAULT_DIRECTIONS,
+        .gpio_val = DIB7000P_GPIO_DEFAULT_VALUES,
+        .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
+
+        .pwm_freq_div = 0,
+        .agc_control  = NULL,
+        .spur_protect = 0,
+
+        .output_mode = OUTMODE_MPEG2_SERIAL,
+};
+
 static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
 {
         struct cx23885_tsport *port = ptr;
@@ -182,7 +286,7 @@ static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
         case XC2028_TUNER_RESET:
                 /* Send the tuner in then out of reset */
                 /* GPIO-2 xc3028 tuner */
-                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
+                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
 
                 cx_set(GP0_IO, 0x00040000);
                 cx_clear(GP0_IO, 0x00000004);
@@ -192,10 +296,10 @@ static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
                 msleep(5);
                 break;
         case XC2028_RESET_CLK:
-                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
+                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
                 break;
         default:
-                dprintk(1, "%s: unknown command %d, arg %d\n", __FUNCTION__,
+                dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
                         command, arg);
                 return -EINVAL;
         }
@@ -271,8 +375,9 @@ static int dvb_register(struct cx23885_tsport *port)
                                                 &fusionhdtv_5_express,
                                                 &i2c_bus->i2c_adap);
                 if (port->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, port->dvb.frontend, 0x61,
-                                   &i2c_bus->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
+                        dvb_attach(simple_tuner_attach, port->dvb.frontend,
+                                   &i2c_bus->i2c_adap, 0x61,
+                                   TUNER_LG_TDVS_H06XF);
                 }
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -297,13 +402,52 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &i2c_bus->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .video_dev = port,
                                 .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
                                 .fname       = "xc3028-v27.fw",
                                 .max_len     = 64,
-                                .scode_table = OREN538,
+                                .scode_table = XC3028_FE_OREN538,
+                        };
+
+                        fe = dvb_attach(xc2028_attach,
+                                        port->dvb.frontend, &cfg);
+                        if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)
+                                fe->ops.tuner_ops.set_config(fe, &ctl);
+                }
+                break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1200:
+        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+                i2c_bus = &dev->i2c_bus[0];
+                port->dvb.frontend = dvb_attach(tda10048_attach,
+                        &hauppauge_hvr1200_config,
+                        &i2c_bus->i2c_adap);
+                if (port->dvb.frontend != NULL) {
+                        dvb_attach(tda829x_attach, port->dvb.frontend,
+                                &dev->i2c_bus[1].i2c_adap, 0x42,
+                                &tda829x_no_probe);
+                        dvb_attach(tda18271_attach, port->dvb.frontend,
+                                0x60, &dev->i2c_bus[1].i2c_adap,
+                                &hauppauge_hvr1200_tuner_config);
+                }
+                break;
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+                i2c_bus = &dev->i2c_bus[0];
+                port->dvb.frontend = dvb_attach(dib7000p_attach,
+                        &i2c_bus->i2c_adap,
+                        0x12, &hauppauge_hvr1400_dib7000_config);
+                if (port->dvb.frontend != NULL) {
+                        struct dvb_frontend *fe;
+                        struct xc2028_config cfg = {
+                                .i2c_adap  = &dev->i2c_bus[1].i2c_adap,
+                                .i2c_addr  = 0x64,
+                                .callback  = cx23885_hvr1500_xc3028_callback,
+                        };
+                        static struct xc2028_ctrl ctl = {
+                                .fname   = "xc3028L-v36.fw",
+                                .max_len = 64,
+                                .demod   = 5000,
+                                .d2633   = 1
                         };
 
                         fe = dvb_attach(xc2028_attach,
@@ -330,7 +474,7 @@ static int dvb_register(struct cx23885_tsport *port)
 
         /* register everything */
         return videobuf_dvb_register(&port->dvb, THIS_MODULE, port,
-                                     &dev->pci->dev);
+                                     &dev->pci->dev, adapter_nr);
 }
 
 int cx23885_dvb_register(struct cx23885_tsport *port)
@@ -338,7 +482,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         int err;
 
-        dprintk(1, "%s\n", __FUNCTION__);
+        dprintk(1, "%s\n", __func__);
         dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
                 dev->board,
                 dev->name,
@@ -349,12 +493,12 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 
         /* dvb stuff */
         printk("%s: cx23885 based dvb card\n", dev->name);
-        videobuf_queue_pci_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock,
+        videobuf_queue_sg_init(&port->dvb.dvbq, &dvb_qops, &dev->pci->dev, &port->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,
                             sizeof(struct cx23885_buffer), port);
         err = dvb_register(port);
         if (err != 0)
-                printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
+                printk("%s() dvb_register failed err = %d\n", __func__, err);
 
         return err;
 }
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 92fe0bd37c84..c6bb0a05bc1c 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -33,7 +33,7 @@ static unsigned int i2c_debug;
 module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-static unsigned int i2c_scan = 0;
+static unsigned int i2c_scan;
 module_param(i2c_scan, int, 0444);
 MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
 
@@ -87,10 +87,10 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
         int retval, cnt;
 
         if (joined_rlen)
-                dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __FUNCTION__,
+                dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __func__,
                         msg->len, joined_rlen);
         else
-                dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+                dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
         /* Deal with i2c probe functions with zero payload */
         if (msg->len == 0) {
@@ -101,7 +101,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                 if (!i2c_slave_did_ack(i2c_adap))
                         return -EIO;
 
-                dprintk(1, "%s() returns 0\n", __FUNCTION__);
+                dprintk(1, "%s() returns 0\n", __func__);
                 return 0;
         }
 
@@ -176,7 +176,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
 
         if (i2c_debug && !joined)
-                dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+                dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
 
         /* Deal with i2c probe functions with zero payload */
         if (msg->len == 0) {
@@ -188,7 +188,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                         return -EIO;
 
 
-                dprintk(1, "%s() returns 0\n", __FUNCTION__);
+                dprintk(1, "%s() returns 0\n", __func__);
                 return 0;
         }
 
@@ -238,11 +238,11 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
         struct cx23885_dev *dev = bus->dev;
         int i, retval = 0;
 
-        dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
+        dprintk(1, "%s(num = %d)\n", __func__, num);
 
         for (i = 0 ; i < num; i++) {
                 dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
-                        __FUNCTION__, num, msgs[i].addr, msgs[i].len);
+                        __func__, num, msgs[i].addr, msgs[i].len);
                 if (msgs[i].flags & I2C_M_RD) {
                         /* read */
                         retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
@@ -353,6 +353,8 @@ static struct i2c_client cx23885_i2c_client_template = {
 };
 
 static char *i2c_devs[128] = {
+        [0x10 >> 1]   = "tda10048",
+        [0x12 >> 1]   = "dib7000pc",
         [ 0x1c >> 1 ] = "lgdt3303",
         [ 0x86 >> 1 ] = "tda9887",
         [ 0x32 >> 1 ] = "cx24227",
@@ -360,7 +362,8 @@ static char *i2c_devs[128] = {
         [ 0x84 >> 1 ] = "tda8295",
         [ 0xa0 >> 1 ] = "eeprom",
         [ 0xc0 >> 1 ] = "tuner/mt2131/tda8275",
-        [ 0xc2 >> 1 ] = "tuner/mt2131/tda8275/xc5000",
+        [0xc2 >> 1] = "tuner/mt2131/tda8275/xc5000/xc3028",
+        [0xc8 >> 1]   = "tuner/xc3028L",
 };
 
 static void do_i2c_scan(char *name, struct i2c_client *c)
@@ -383,7 +386,7 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 {
         struct cx23885_dev *dev = bus->dev;
 
-        dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
+        dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
 
         memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
                sizeof(bus->i2c_adap));
@@ -420,6 +423,29 @@ int cx23885_i2c_unregister(struct cx23885_i2c *bus)
         return 0;
 }
 
+void cx23885_av_clk(struct cx23885_dev *dev, int enable)
+{
+        /* write 0 to bus 2 addr 0x144 via i2x_xfer() */
+        char buffer[3];
+        struct i2c_msg msg;
+        dprintk(1, "%s(enabled = %d)\n", __func__, enable);
+
+        /* Register 0x144 */
+        buffer[0] = 0x01;
+        buffer[1] = 0x44;
+        if (enable == 1)
+                buffer[2] = 0x05;
+        else
+                buffer[2] = 0x00;
+
+        msg.addr = 0x44;
+        msg.flags = I2C_M_TEN;
+        msg.len = 3;
+        msg.buf = buffer;
+
+        i2c_xfer(&dev->i2c_bus[2].i2c_adap, &msg, 1);
+}
+
 /* ----------------------------------------------------------------------- */
 
 /*
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index d3c4d2c5cbe0..84652210a28c 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -141,7 +141,7 @@ static struct cx23885_fmt *format_by_fourcc(unsigned int fourcc)
                 if (formats[i].fourcc == fourcc)
                         return formats+i;
 
-        printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __FUNCTION__, fourcc);
+        printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __func__, fourcc);
         return NULL;
 }
 
@@ -292,13 +292,13 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
         }
         if (bc != 1)
                 printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
-                        __FUNCTION__, bc);
+                        __func__, bc);
 }
 
 int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 {
         dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
-                __FUNCTION__,
+                __func__,
                 (unsigned int)norm,
                 v4l2_norm_to_name(norm));
 
@@ -319,7 +319,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                                     char *type)
 {
         struct video_device *vfd;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         vfd = video_device_alloc();
         if (NULL == vfd)
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(cx23885_ctrl_query);
 static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh,
         unsigned int bit)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         if (fh->resources & bit)
                 /* have it already allocated */
                 return 1;
@@ -392,7 +392,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
         unsigned int bits)
 {
         BUG_ON((fh->resources & bits) != bits);
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
@@ -407,7 +407,7 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
         memset(&route, 0, sizeof(route));
 
         dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
-                __FUNCTION__,
+                __func__,
                 input, INPUT(input)->vmux,
                 INPUT(input)->gpio0, INPUT(input)->gpio1,
                 INPUT(input)->gpio2, INPUT(input)->gpio3);
@@ -427,7 +427,7 @@ EXPORT_SYMBOL(cx23885_video_mux);
 int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
         unsigned int height, enum v4l2_field field)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         return 0;
 }
 
@@ -435,7 +435,7 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev,
                            struct cx23885_dmaqueue *q,
                            struct cx23885_buffer *buf)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         /* setup fifo + format */
         cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01],
@@ -463,7 +463,7 @@ static int cx23885_restart_video_queue(struct cx23885_dev *dev,
 {
         struct cx23885_buffer *buf, *prev;
         struct list_head *item;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx23885_buffer,
@@ -579,13 +579,13 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                         if (dev->tvnorm & V4L2_STD_NTSC) {
                                 /* cx25840 transmits NTSC bottom field first */
                                 dprintk(1, "%s() Creating NTSC risc\n",
-                                        __FUNCTION__);
+                                        __func__);
                                 line0_offset = buf->bpl;
                                 line1_offset = 0;
                         } else {
                                 /* All other formats are top field first */
                                 dprintk(1, "%s() Creating PAL/SECAM risc\n",
-                                        __FUNCTION__);
+                                        __func__);
                                 line0_offset = 0;
                                 line1_offset = buf->bpl;
                         }
@@ -765,8 +765,8 @@ static int video_open(struct inode *inode, struct file *file)
         fh->height   = 240;
         fh->fmt      = format_by_fourcc(V4L2_PIX_FMT_BGR24);
 
-        videobuf_queue_pci_init(&fh->vidq, &cx23885_video_qops,
-                            dev->pci, &dev->slock,
+        videobuf_queue_sg_init(&fh->vidq, &cx23885_video_qops,
+                            &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx23885_buffer),
@@ -885,7 +885,7 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)
 
 int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
-        dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __FUNCTION__);
+        dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
         return 0;
 }
@@ -894,7 +894,7 @@ EXPORT_SYMBOL(cx23885_get_control);
 int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
-                " (disabled - no action)\n", __FUNCTION__);
+                " (disabled - no action)\n", __func__);
         return 0;
 }
 EXPORT_SYMBOL(cx23885_set_control);
@@ -990,7 +990,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
         struct cx23885_dev *dev  = ((struct cx23885_fh *)priv)->dev;
         int err;
 
-        dprintk(2, "%s()\n", __FUNCTION__);
+        dprintk(2, "%s()\n", __func__);
         err = vidioc_try_fmt_cap(file, priv, f);
 
         if (0 != err)
@@ -999,7 +999,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
         fh->width      = f->fmt.pix.width;
         fh->height     = f->fmt.pix.height;
         fh->vidq.field = f->fmt.pix.field;
-        dprintk(2, "%s() width=%d height=%d field=%d\n", __FUNCTION__,
+        dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
                 fh->width, fh->height, fh->vidq.field);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_FMT, f);
         return 0;
@@ -1101,7 +1101,7 @@ static int vidioc_streamon(struct file *file, void *priv,
 {
         struct cx23885_fh *fh = priv;
         struct cx23885_dev *dev = fh->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
                 return -EINVAL;
@@ -1118,7 +1118,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
         struct cx23885_fh *fh = priv;
         struct cx23885_dev *dev = fh->dev;
         int err, res;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
@@ -1136,7 +1136,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         mutex_lock(&dev->lock);
         cx23885_set_tvnorm(dev, *tvnorms);
@@ -1159,7 +1159,7 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
                 [CX23885_VMUX_DEBUG]      = "for debug only",
         };
         unsigned int n;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
 
         n = i->index;
         if (n >= 4)
@@ -1184,7 +1184,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
                                 struct v4l2_input *i)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         return cx23885_enum_input(dev, i);
 }
 
@@ -1193,7 +1193,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
         *i = dev->input;
-        dprintk(1, "%s() returns %d\n", __FUNCTION__, *i);
+        dprintk(1, "%s() returns %d\n", __func__, *i);
         return 0;
 }
 
@@ -1201,10 +1201,10 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 {
         struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
-        dprintk(1, "%s(%d)\n", __FUNCTION__, i);
+        dprintk(1, "%s(%d)\n", __func__, i);
 
         if (i >= 4) {
-                dprintk(1, "%s() -EINVAL\n", __FUNCTION__);
+                dprintk(1, "%s() -EINVAL\n", __func__);
                 return -EINVAL;
         }
 
@@ -1389,7 +1389,7 @@ int cx23885_video_irq(struct cx23885_dev *dev, u32 status)
                 return handled;
         cx_write(VID_A_INT_STAT, status);
 
-        dprintk(2, "%s() status = 0x%08x\n", __FUNCTION__, status);
+        dprintk(2, "%s() status = 0x%08x\n", __func__, status);
         /* risc op code error */
         if (status & (1 << 16)) {
                 printk(KERN_WARNING "%s/0: video risc op code error\n",
@@ -1487,7 +1487,7 @@ static const struct file_operations radio_fops = {
 
 void cx23885_video_unregister(struct cx23885_dev *dev)
 {
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         cx_clear(PCI_INT_MSK, 1);
 
         if (dev->video_dev) {
@@ -1505,7 +1505,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
 {
         int err;
 
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         spin_lock_init(&dev->slock);
 
         /* Initialize VBI template */
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 7cb2179f2622..32af87f25e7b 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -32,6 +32,7 @@
 
 #include "btcx-risc.h"
 #include "cx23885-reg.h"
+#include "media/cx2341x.h"
 
 #include <linux/version.h>
 #include <linux/mutex.h>
@@ -59,6 +60,9 @@
 #define CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP   4
 #define CX23885_BOARD_HAUPPAUGE_HVR1500Q       5
 #define CX23885_BOARD_HAUPPAUGE_HVR1500        6
+#define CX23885_BOARD_HAUPPAUGE_HVR1200        7
+#define CX23885_BOARD_HAUPPAUGE_HVR1700        8
+#define CX23885_BOARD_HAUPPAUGE_HVR1400        9
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\
@@ -154,6 +158,7 @@ typedef enum {
         CX23885_MPEG_UNDEFINED = 0,
         CX23885_MPEG_DVB,
         CX23885_ANALOG_VIDEO,
+        CX23885_MPEG_ENCODER,
 } port_t;
 
 struct cx23885_board {
@@ -252,6 +257,8 @@ struct cx23885_tsport {
         u32                        gen_ctrl_val;
         u32                        ts_clk_en_val;
         u32                        src_sel_val;
+        u32                        vld_misc_val;
+        u32                        hw_sop_ctrl_val;
 };
 
 struct cx23885_dev {
@@ -312,6 +319,14 @@ struct cx23885_dev {
         struct cx23885_dmaqueue    vidq;
         struct cx23885_dmaqueue    vbiq;
         spinlock_t                 slock;
+
+        /* MPEG Encoder ONLY settings */
+        u32                        cx23417_mailbox;
+        struct cx2341x_mpeg_params mpeg_params;
+        struct video_device        *v4l_device;
+        atomic_t                   v4l_reader_count;
+        struct cx23885_tvnorm      encodernorm;
+
 };
 
 extern struct list_head cx23885_devlist;
@@ -431,6 +446,18 @@ extern int cx23885_i2c_register(struct cx23885_i2c *bus);
 extern int cx23885_i2c_unregister(struct cx23885_i2c *bus);
 extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd,
                                      void *arg);
+extern void cx23885_av_clk(struct cx23885_dev *dev, int enable);
+
+/* ----------------------------------------------------------- */
+/* cx23885-417.c                                               */
+extern int cx23885_417_register(struct cx23885_dev *dev);
+extern void cx23885_417_unregister(struct cx23885_dev *dev);
+extern int cx23885_irq_417(struct cx23885_dev *dev, u32 status);
+extern void cx23885_417_check_encoder(struct cx23885_dev *dev);
+extern void cx23885_mc417_init(struct cx23885_dev *dev);
+extern int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value);
+extern int mc417_memory_write(struct cx23885_dev *dev, u32 address, u32 value);
+
 
 /* ----------------------------------------------------------- */
 /* tv norms                                                    */