Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

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

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

6 files changed, 310 insertions, 92 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4561cd89938d..9fd8cc7dbb23 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -353,6 +353,44 @@ static struct em28xx_reg_seq hauppauge_930c_digital[] = {
 };
 #endif
 
+/* 1b80:e425 MaxMedia UB425-TC
+ * GPIO_6 - demod reset, 0=active
+ * GPIO_7 - LED, 0=active
+ */
+static struct em28xx_reg_seq maxmedia_ub425_tc[] = {
+        {EM2874_R80_GPIO,  0x83,  0xff,  100},
+        {EM2874_R80_GPIO,  0xc3,  0xff,  100}, /* GPIO_6 = 1 */
+        {EM2874_R80_GPIO,  0x43,  0xff,  000}, /* GPIO_7 = 0 */
+        {-1,                 -1,    -1,   -1},
+};
+
+/* 2304:0242 PCTV QuatroStick (510e)
+ * GPIO_2: decoder reset, 0=active
+ * GPIO_4: decoder suspend, 0=active
+ * GPIO_6: demod reset, 0=active
+ * GPIO_7: LED, 1=active
+ */
+static struct em28xx_reg_seq pctv_510e[] = {
+        {EM2874_R80_GPIO, 0x10, 0xff, 100},
+        {EM2874_R80_GPIO, 0x14, 0xff, 100}, /* GPIO_2 = 1 */
+        {EM2874_R80_GPIO, 0x54, 0xff, 050}, /* GPIO_6 = 1 */
+        {             -1,   -1,   -1,  -1},
+};
+
+/* 2013:0251 PCTV QuatroStick nano (520e)
+ * GPIO_2: decoder reset, 0=active
+ * GPIO_4: decoder suspend, 0=active
+ * GPIO_6: demod reset, 0=active
+ * GPIO_7: LED, 1=active
+ */
+static struct em28xx_reg_seq pctv_520e[] = {
+        {EM2874_R80_GPIO, 0x10, 0xff, 100},
+        {EM2874_R80_GPIO, 0x14, 0xff, 100}, /* GPIO_2 = 1 */
+        {EM2874_R80_GPIO, 0x54, 0xff, 050}, /* GPIO_6 = 1 */
+        {EM2874_R80_GPIO, 0xd4, 0xff, 000}, /* GPIO_7 = 1 */
+        {             -1,   -1,   -1,  -1},
+};
+
 /*
  *  Board definitions
  */
@@ -1908,6 +1946,41 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_LINE_IN,
                 } },
         },
+        /* 1b80:e425 MaxMedia UB425-TC
+         * Empia EM2874B + Micronas DRX 3913KA2 + NXP TDA18271HDC2 */
+        [EM2874_BOARD_MAXMEDIA_UB425_TC] = {
+                .name          = "MaxMedia UB425-TC",
+                .tuner_type    = TUNER_ABSENT,
+                .tuner_gpio    = maxmedia_ub425_tc,
+                .has_dvb       = 1,
+                .i2c_speed     = EM2874_I2C_SECONDARY_BUS_SELECT |
+                                EM28XX_I2C_CLK_WAIT_ENABLE |
+                                EM28XX_I2C_FREQ_400_KHZ,
+        },
+        /* 2304:0242 PCTV QuatroStick (510e)
+         * Empia EM2884 + Micronas DRX 3926K + NXP TDA18271HDC2 */
+        [EM2884_BOARD_PCTV_510E] = {
+                .name          = "PCTV QuatroStick (510e)",
+                .tuner_type    = TUNER_ABSENT,
+                .tuner_gpio    = pctv_510e,
+                .has_dvb       = 1,
+                .ir_codes      = RC_MAP_PINNACLE_PCTV_HD,
+                .i2c_speed     = EM2874_I2C_SECONDARY_BUS_SELECT |
+                                EM28XX_I2C_CLK_WAIT_ENABLE |
+                                EM28XX_I2C_FREQ_400_KHZ,
+        },
+        /* 2013:0251 PCTV QuatroStick nano (520e)
+         * Empia EM2884 + Micronas DRX 3926K + NXP TDA18271HDC2 */
+        [EM2884_BOARD_PCTV_520E] = {
+                .name          = "PCTV QuatroStick nano (520e)",
+                .tuner_type    = TUNER_ABSENT,
+                .tuner_gpio    = pctv_520e,
+                .has_dvb       = 1,
+                .ir_codes      = RC_MAP_PINNACLE_PCTV_HD,
+                .i2c_speed     = EM2874_I2C_SECONDARY_BUS_SELECT |
+                                EM28XX_I2C_CLK_WAIT_ENABLE |
+                                EM28XX_I2C_FREQ_400_KHZ,
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -2059,6 +2132,12 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2860_BOARD_HT_VIDBOX_NW03 },
         { USB_DEVICE(0x1b80, 0xe309), /* Sveon STV40 */
                         .driver_info = EM2860_BOARD_EASYCAP },
+        { USB_DEVICE(0x1b80, 0xe425),
+                        .driver_info = EM2874_BOARD_MAXMEDIA_UB425_TC },
+        { USB_DEVICE(0x2304, 0x0242),
+                        .driver_info = EM2884_BOARD_PCTV_510E },
+        { USB_DEVICE(0x2013, 0x0251),
+                        .driver_info = EM2884_BOARD_PCTV_520E },
         { },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -3122,7 +3201,6 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         int i, nr;
         const int ifnum = interface->altsetting[0].desc.bInterfaceNumber;
         char *speed;
-        char descr[255] = "";
 
         udev = usb_get_dev(interface_to_usbdev(interface));
 
@@ -3227,21 +3305,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 speed = "unknown";
         }
 
-        if (udev->manufacturer)
-                strlcpy(descr, udev->manufacturer, sizeof(descr));
-
-        if (udev->product) {
-                if (*descr)
-                        strlcat(descr, " ", sizeof(descr));
-                strlcat(descr, udev->product, sizeof(descr));
-        }
-
-        if (*descr)
-                strlcat(descr, " ", sizeof(descr));
-
         printk(KERN_INFO DRIVER_NAME
-                ": New device %s@ %s Mbps (%04x:%04x, interface %d, class %d)\n",
-                descr,
+                ": New device %s %s @ %s Mbps "
+                "(%04x:%04x, interface %d, class %d)\n",
+                udev->manufacturer ? udev->manufacturer : "",
+                udev->product ? udev->product : "",
                 speed,
                 le16_to_cpu(udev->descriptor.idVendor),
                 le16_to_cpu(udev->descriptor.idProduct),
@@ -3307,6 +3375,17 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 goto unlock_and_free;
         }
 
+        if (has_dvb) {
+                /* pre-allocate DVB isoc transfer buffers */
+                retval = em28xx_alloc_isoc(dev, EM28XX_DIGITAL_MODE,
+                                           EM28XX_DVB_MAX_PACKETS,
+                                           EM28XX_DVB_NUM_BUFS,
+                                           dev->dvb_max_pkt_size);
+                if (retval) {
+                        goto unlock_and_free;
+                }
+        }
+
         request_modules(dev);
 
         /* Should be the last thing to do, to avoid newer udev's to
@@ -3379,7 +3458,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                      video_device_node_name(dev->vdev));
 
                 dev->state |= DEV_MISCONFIGURED;
-                em28xx_uninit_isoc(dev);
+                em28xx_uninit_isoc(dev, dev->mode);
                 dev->state |= DEV_DISCONNECTED;
                 wake_up_interruptible(&dev->wait_frame);
                 wake_up_interruptible(&dev->wait_stream);
@@ -3388,6 +3467,9 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                 em28xx_release_resources(dev);
         }
 
+        /* free DVB isoc buffers */
+        em28xx_uninit_isoc(dev, EM28XX_DIGITAL_MODE);
+
         mutex_unlock(&dev->lock);
 
         em28xx_close_extension(dev);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 0aacc96f9a23..53a9fb91e97e 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -666,6 +666,7 @@ int em28xx_capture_start(struct em28xx *dev, int start)
 
         return rc;
 }
+EXPORT_SYMBOL_GPL(em28xx_capture_start);
 
 int em28xx_vbi_supported(struct em28xx *dev)
 {
@@ -961,146 +962,192 @@ static void em28xx_irq_callback(struct urb *urb)
 /*
  * Stop and Deallocate URBs
  */
-void em28xx_uninit_isoc(struct em28xx *dev)
+void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode)
 {
         struct urb *urb;
+        struct em28xx_usb_isoc_bufs *isoc_bufs;
         int i;
 
-        em28xx_isocdbg("em28xx: called em28xx_uninit_isoc\n");
+        em28xx_isocdbg("em28xx: called em28xx_uninit_isoc in mode %d\n", mode);
+
+        if (mode == EM28XX_DIGITAL_MODE)
+                isoc_bufs = &dev->isoc_ctl.digital_bufs;
+        else
+                isoc_bufs = &dev->isoc_ctl.analog_bufs;
 
         dev->isoc_ctl.nfields = -1;
-        for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-                urb = dev->isoc_ctl.urb[i];
+        for (i = 0; i < isoc_bufs->num_bufs; i++) {
+                urb = isoc_bufs->urb[i];
                 if (urb) {
                         if (!irqs_disabled())
                                 usb_kill_urb(urb);
                         else
                                 usb_unlink_urb(urb);
 
-                        if (dev->isoc_ctl.transfer_buffer[i]) {
+                        if (isoc_bufs->transfer_buffer[i]) {
                                 usb_free_coherent(dev->udev,
                                         urb->transfer_buffer_length,
-                                        dev->isoc_ctl.transfer_buffer[i],
+                                        isoc_bufs->transfer_buffer[i],
                                         urb->transfer_dma);
                         }
                         usb_free_urb(urb);
-                        dev->isoc_ctl.urb[i] = NULL;
+                        isoc_bufs->urb[i] = NULL;
                 }
-                dev->isoc_ctl.transfer_buffer[i] = NULL;
+                isoc_bufs->transfer_buffer[i] = NULL;
         }
 
-        kfree(dev->isoc_ctl.urb);
-        kfree(dev->isoc_ctl.transfer_buffer);
+        kfree(isoc_bufs->urb);
+        kfree(isoc_bufs->transfer_buffer);
 
-        dev->isoc_ctl.urb = NULL;
-        dev->isoc_ctl.transfer_buffer = NULL;
-        dev->isoc_ctl.num_bufs = 0;
+        isoc_bufs->urb = NULL;
+        isoc_bufs->transfer_buffer = NULL;
+        isoc_bufs->num_bufs = 0;
 
         em28xx_capture_start(dev, 0);
 }
 EXPORT_SYMBOL_GPL(em28xx_uninit_isoc);
 
 /*
- * Allocate URBs and start IRQ
+ * Allocate URBs
  */
-int em28xx_init_isoc(struct em28xx *dev, int max_packets,
-                     int num_bufs, int max_pkt_size,
-                     int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
+int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
+                      int max_packets, int num_bufs, int max_pkt_size)
 {
-        struct em28xx_dmaqueue *dma_q = &dev->vidq;
-        struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
+        struct em28xx_usb_isoc_bufs *isoc_bufs;
         int i;
         int sb_size, pipe;
         struct urb *urb;
         int j, k;
-        int rc;
 
-        em28xx_isocdbg("em28xx: called em28xx_prepare_isoc\n");
+        em28xx_isocdbg("em28xx: called em28xx_alloc_isoc in mode %d\n", mode);
+
+        if (mode == EM28XX_DIGITAL_MODE)
+                isoc_bufs = &dev->isoc_ctl.digital_bufs;
+        else
+                isoc_bufs = &dev->isoc_ctl.analog_bufs;
 
         /* De-allocates all pending stuff */
-        em28xx_uninit_isoc(dev);
+        em28xx_uninit_isoc(dev, mode);
 
-        dev->isoc_ctl.isoc_copy = isoc_copy;
-        dev->isoc_ctl.num_bufs = num_bufs;
+        isoc_bufs->num_bufs = num_bufs;
 
-        dev->isoc_ctl.urb = kzalloc(sizeof(void *)*num_bufs,  GFP_KERNEL);
-        if (!dev->isoc_ctl.urb) {
+        isoc_bufs->urb = kzalloc(sizeof(void *)*num_bufs,  GFP_KERNEL);
+        if (!isoc_bufs->urb) {
                 em28xx_errdev("cannot alloc memory for usb buffers\n");
                 return -ENOMEM;
         }
 
-        dev->isoc_ctl.transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
-                                              GFP_KERNEL);
-        if (!dev->isoc_ctl.transfer_buffer) {
+        isoc_bufs->transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
+                                             GFP_KERNEL);
+        if (!isoc_bufs->transfer_buffer) {
                 em28xx_errdev("cannot allocate memory for usb transfer\n");
-                kfree(dev->isoc_ctl.urb);
+                kfree(isoc_bufs->urb);
                 return -ENOMEM;
         }
 
-        dev->isoc_ctl.max_pkt_size = max_pkt_size;
+        isoc_bufs->max_pkt_size = max_pkt_size;
+        isoc_bufs->num_packets = max_packets;
         dev->isoc_ctl.vid_buf = NULL;
         dev->isoc_ctl.vbi_buf = NULL;
 
-        sb_size = max_packets * dev->isoc_ctl.max_pkt_size;
+        sb_size = isoc_bufs->num_packets * isoc_bufs->max_pkt_size;
 
         /* allocate urbs and transfer buffers */
-        for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-                urb = usb_alloc_urb(max_packets, GFP_KERNEL);
+        for (i = 0; i < isoc_bufs->num_bufs; i++) {
+                urb = usb_alloc_urb(isoc_bufs->num_packets, GFP_KERNEL);
                 if (!urb) {
                         em28xx_err("cannot alloc isoc_ctl.urb %i\n", i);
-                        em28xx_uninit_isoc(dev);
+                        em28xx_uninit_isoc(dev, mode);
                         return -ENOMEM;
                 }
-                dev->isoc_ctl.urb[i] = urb;
+                isoc_bufs->urb[i] = urb;
 
-                dev->isoc_ctl.transfer_buffer[i] = usb_alloc_coherent(dev->udev,
+                isoc_bufs->transfer_buffer[i] = usb_alloc_coherent(dev->udev,
                         sb_size, GFP_KERNEL, &urb->transfer_dma);
-                if (!dev->isoc_ctl.transfer_buffer[i]) {
+                if (!isoc_bufs->transfer_buffer[i]) {
                         em28xx_err("unable to allocate %i bytes for transfer"
                                         " buffer %i%s\n",
                                         sb_size, i,
                                         in_interrupt() ? " while in int" : "");
-                        em28xx_uninit_isoc(dev);
+                        em28xx_uninit_isoc(dev, mode);
                         return -ENOMEM;
                 }
-                memset(dev->isoc_ctl.transfer_buffer[i], 0, sb_size);
+                memset(isoc_bufs->transfer_buffer[i], 0, sb_size);
 
                 /* FIXME: this is a hack - should be
                         'desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK'
                         should also be using 'desc.bInterval'
                  */
                 pipe = usb_rcvisocpipe(dev->udev,
-                                       dev->mode == EM28XX_ANALOG_MODE ?
+                                       mode == EM28XX_ANALOG_MODE ?
                                        EM28XX_EP_ANALOG : EM28XX_EP_DIGITAL);
 
                 usb_fill_int_urb(urb, dev->udev, pipe,
-                                 dev->isoc_ctl.transfer_buffer[i], sb_size,
+                                 isoc_bufs->transfer_buffer[i], sb_size,
                                  em28xx_irq_callback, dev, 1);
 
-                urb->number_of_packets = max_packets;
+                urb->number_of_packets = isoc_bufs->num_packets;
                 urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
 
                 k = 0;
-                for (j = 0; j < max_packets; j++) {
+                for (j = 0; j < isoc_bufs->num_packets; j++) {
                         urb->iso_frame_desc[j].offset = k;
                         urb->iso_frame_desc[j].length =
-                                                dev->isoc_ctl.max_pkt_size;
-                        k += dev->isoc_ctl.max_pkt_size;
+                                                isoc_bufs->max_pkt_size;
+                        k += isoc_bufs->max_pkt_size;
                 }
         }
 
+        return 0;
+}
+EXPORT_SYMBOL_GPL(em28xx_alloc_isoc);
+
+/*
+ * Allocate URBs and start IRQ
+ */
+int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
+                     int max_packets, int num_bufs, int max_pkt_size,
+                     int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
+{
+        struct em28xx_dmaqueue *dma_q = &dev->vidq;
+        struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
+        struct em28xx_usb_isoc_bufs *isoc_bufs;
+        int i;
+        int rc;
+        int alloc;
+
+        em28xx_isocdbg("em28xx: called em28xx_init_isoc in mode %d\n", mode);
+
+        dev->isoc_ctl.isoc_copy = isoc_copy;
+
+        if (mode == EM28XX_DIGITAL_MODE) {
+                isoc_bufs = &dev->isoc_ctl.digital_bufs;
+                /* no need to free/alloc isoc buffers in digital mode */
+                alloc = 0;
+        } else {
+                isoc_bufs = &dev->isoc_ctl.analog_bufs;
+                alloc = 1;
+        }
+
+        if (alloc) {
+                rc = em28xx_alloc_isoc(dev, mode, max_packets,
+                                       num_bufs, max_pkt_size);
+                if (rc)
+                        return rc;
+        }
+
         init_waitqueue_head(&dma_q->wq);
         init_waitqueue_head(&vbi_dma_q->wq);
 
         em28xx_capture_start(dev, 1);
 
         /* submit urbs and enables IRQ */
-        for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-                rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_ATOMIC);
+        for (i = 0; i < isoc_bufs->num_bufs; i++) {
+                rc = usb_submit_urb(isoc_bufs->urb[i], GFP_ATOMIC);
                 if (rc) {
                         em28xx_err("submit of urb %i failed (error=%i)\n", i,
                                    rc);
-                        em28xx_uninit_isoc(dev);
+                        em28xx_uninit_isoc(dev, mode);
                         return rc;
                 }
         }
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index aabbf4854f66..503a8d5b5382 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -61,9 +61,6 @@ if (debug >= level) 						\
         printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg); \
 } while (0)
 
-#define EM28XX_DVB_NUM_BUFS 5
-#define EM28XX_DVB_MAX_PACKETS 64
-
 struct em28xx_dvb {
         struct dvb_frontend        *fe[2];
 
@@ -172,20 +169,21 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
         max_dvb_packet_size = dev->dvb_max_pkt_size;
         if (max_dvb_packet_size < 0)
                 return max_dvb_packet_size;
-        dprintk(1, "Using %d buffers each with %d bytes\n",
+        dprintk(1, "Using %d buffers each with %d x %d bytes\n",
                 EM28XX_DVB_NUM_BUFS,
+                EM28XX_DVB_MAX_PACKETS,
                 max_dvb_packet_size);
 
-        return em28xx_init_isoc(dev, EM28XX_DVB_MAX_PACKETS,
-                                EM28XX_DVB_NUM_BUFS, max_dvb_packet_size,
-                                em28xx_dvb_isoc_copy);
+        return em28xx_init_isoc(dev, EM28XX_DIGITAL_MODE,
+                                EM28XX_DVB_MAX_PACKETS, EM28XX_DVB_NUM_BUFS,
+                                max_dvb_packet_size, em28xx_dvb_isoc_copy);
 }
 
 static int em28xx_stop_streaming(struct em28xx_dvb *dvb)
 {
         struct em28xx *dev = dvb->adapter.priv;
 
-        em28xx_uninit_isoc(dev);
+        em28xx_capture_start(dev, 0);
 
         em28xx_set_mode(dev, EM28XX_SUSPEND);
 
@@ -327,6 +325,19 @@ struct drxk_config hauppauge_930c_drxk = {
         .chunk_size = 56,
 };
 
+struct drxk_config maxmedia_ub425_tc_drxk = {
+        .adr = 0x29,
+        .single_master = 1,
+        .no_i2c_bridge = 1,
+};
+
+struct drxk_config pctv_520e_drxk = {
+        .adr = 0x29,
+        .single_master = 1,
+        .microcode_name = "dvb-demod-drxk-pctv.fw",
+        .chunk_size = 58,
+};
+
 static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
 {
         struct em28xx_dvb *dvb = fe->sec_priv;
@@ -460,6 +471,33 @@ static void terratec_h5_init(struct em28xx *dev)
         em28xx_gpio_set(dev, terratec_h5_end);
 };
 
+static void pctv_520e_init(struct em28xx *dev)
+{
+        /*
+         * Init TDA8295(?) analog demodulator. Looks like I2C traffic to
+         * digital demodulator and tuner are routed via TDA8295.
+         */
+        int i;
+        struct {
+                unsigned char r[4];
+                int len;
+        } regs[] = {
+                {{ 0x06, 0x02, 0x00, 0x31 }, 4},
+                {{ 0x01, 0x02 }, 2},
+                {{ 0x01, 0x02, 0x00, 0xc6 }, 4},
+                {{ 0x01, 0x00 }, 2},
+                {{ 0x01, 0x00, 0xff, 0xaf }, 4},
+                {{ 0x01, 0x00, 0x03, 0xa0 }, 4},
+                {{ 0x01, 0x00 }, 2},
+                {{ 0x01, 0x00, 0x73, 0xaf }, 4},
+        };
+
+        dev->i2c_client.addr = 0x82 >> 1; /* 0x41 */
+
+        for (i = 0; i < ARRAY_SIZE(regs); i++)
+                i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len);
+};
+
 static int em28xx_mt352_terratec_xs_init(struct dvb_frontend *fe)
 {
         /* Values extracted from a USB trace of the Terratec Windows driver */
@@ -938,6 +976,48 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         dvb_attach(a8293_attach, dvb->fe[0], &dev->i2c_adap,
                                 &em28xx_a8293_config);
                 break;
+        case EM2874_BOARD_MAXMEDIA_UB425_TC:
+                /* attach demodulator */
+                dvb->fe[0] = dvb_attach(drxk_attach, &maxmedia_ub425_tc_drxk,
+                                &dev->i2c_adap);
+
+                if (dvb->fe[0]) {
+                        /* disable I2C-gate */
+                        dvb->fe[0]->ops.i2c_gate_ctrl = NULL;
+
+                        /* attach tuner */
+                        if (!dvb_attach(tda18271c2dd_attach, dvb->fe[0],
+                                        &dev->i2c_adap, 0x60)) {
+                                dvb_frontend_detach(dvb->fe[0]);
+                                result = -EINVAL;
+                                goto out_free;
+                        }
+                }
+
+                /* TODO: we need drx-3913k firmware in order to support DVB-T */
+                em28xx_info("MaxMedia UB425-TC: only DVB-C supported by that " \
+                                "driver version\n");
+
+                break;
+        case EM2884_BOARD_PCTV_510E:
+        case EM2884_BOARD_PCTV_520E:
+                pctv_520e_init(dev);
+
+                /* attach demodulator */
+                dvb->fe[0] = dvb_attach(drxk_attach, &pctv_520e_drxk,
+                                &dev->i2c_adap);
+
+                if (dvb->fe[0]) {
+                        /* attach tuner */
+                        if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
+                                        &dev->i2c_adap,
+                                        &em28xx_cxd2820r_tda18271_config)) {
+                                dvb_frontend_detach(dvb->fe[0]);
+                                result = -EINVAL;
+                                goto out_free;
+                        }
+                }
+                break;
         default:
                 em28xx_errdev("/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n");
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 36f5a9bc8b76..a88e169dba23 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -41,14 +41,6 @@ static unsigned int i2c_debug;
 module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-
-#define dprintk1(lvl, fmt, args...)                     \
-do {                                                    \
-        if (i2c_debug >= lvl) {                         \
-        printk(fmt, ##args);                            \
-      }                                                 \
-} while (0)
-
 #define dprintk2(lvl, fmt, args...)                     \
 do {                                                    \
         if (i2c_debug >= lvl) {                         \
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 613300b51a9e..324b695c0724 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -760,17 +760,19 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                         goto fail;
         }
 
-        if (!dev->isoc_ctl.num_bufs)
+        if (!dev->isoc_ctl.analog_bufs.num_bufs)
                 urb_init = 1;
 
         if (urb_init) {
                 if (em28xx_vbi_supported(dev) == 1)
-                        rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                        rc = em28xx_init_isoc(dev, EM28XX_ANALOG_MODE,
+                                              EM28XX_NUM_PACKETS,
                                               EM28XX_NUM_BUFS,
                                               dev->max_pkt_size,
                                               em28xx_isoc_copy_vbi);
                 else
-                        rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                        rc = em28xx_init_isoc(dev, EM28XX_ANALOG_MODE,
+                                              EM28XX_NUM_PACKETS,
                                               EM28XX_NUM_BUFS,
                                               dev->max_pkt_size,
                                               em28xx_isoc_copy);
@@ -2267,7 +2269,7 @@ static int em28xx_v4l2_close(struct file *filp)
                 v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);
 
                 /* do this before setting alternate! */
-                em28xx_uninit_isoc(dev);
+                em28xx_uninit_isoc(dev, EM28XX_ANALOG_MODE);
                 em28xx_set_mode(dev, EM28XX_SUSPEND);
 
                 /* set alternate 0 */
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 22e252bcc41e..2868b19f8b54 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -125,6 +125,9 @@
 #define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C     81
 #define EM2884_BOARD_CINERGY_HTC_STICK            82
 #define EM2860_BOARD_HT_VIDBOX_NW03               83
+#define EM2874_BOARD_MAXMEDIA_UB425_TC            84
+#define EM2884_BOARD_PCTV_510E                    85
+#define EM2884_BOARD_PCTV_520E                    86
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -151,12 +154,14 @@
 
 /* number of buffers for isoc transfers */
 #define EM28XX_NUM_BUFS 5
+#define EM28XX_DVB_NUM_BUFS 5
 
 /* number of packets for each buffer
    windows requests only 64 packets .. so we better do the same
    this is what I found out for all alternate numbers there!
  */
 #define EM28XX_NUM_PACKETS 64
+#define EM28XX_DVB_MAX_PACKETS 64
 
 #define EM28XX_INTERLACED_DEFAULT 1
 
@@ -197,10 +202,13 @@ enum em28xx_mode {
 
 struct em28xx;
 
-struct em28xx_usb_isoc_ctl {
+struct em28xx_usb_isoc_bufs {
                 /* max packet size of isoc transaction */
         int                             max_pkt_size;
 
+                /* number of packets in each buffer */
+        int                             num_packets;
+
                 /* number of allocated urbs */
         int                             num_bufs;
 
@@ -209,6 +217,14 @@ struct em28xx_usb_isoc_ctl {
 
                 /* transfer buffers for isoc transfer */
         char                            **transfer_buffer;
+};
+
+struct em28xx_usb_isoc_ctl {
+                /* isoc transfer buffers for analog mode */
+        struct em28xx_usb_isoc_bufs     analog_bufs;
+
+                /* isoc transfer buffers for digital mode */
+        struct em28xx_usb_isoc_bufs     digital_bufs;
 
                 /* Last buffer command and region */
         u8                              cmd;
@@ -600,9 +616,6 @@ struct em28xx {
         unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
         int dvb_alt;                            /* alternate for DVB */
         unsigned int dvb_max_pkt_size;          /* wMaxPacketSize for DVB */
-        struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
-        char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc
-                                                   transfer */
         char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
 
         /* helper funcs that call usb_control_msg */
@@ -676,10 +689,12 @@ int em28xx_vbi_supported(struct em28xx *dev);
 int em28xx_set_outfmt(struct em28xx *dev);
 int em28xx_resolution_set(struct em28xx *dev);
 int em28xx_set_alternate(struct em28xx *dev);
-int em28xx_init_isoc(struct em28xx *dev, int max_packets,
-                     int num_bufs, int max_pkt_size,
+int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
+                      int max_packets, int num_bufs, int max_pkt_size);
+int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
+                     int max_packets, int num_bufs, int max_pkt_size,
                      int (*isoc_copy) (struct em28xx *dev, struct urb *urb));
-void em28xx_uninit_isoc(struct em28xx *dev);
+void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode);
 int em28xx_isoc_dvb_max_packetsize(struct em28xx *dev);
 int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode);
 int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);