1 files changed, 156 insertions, 80 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index c36d3f632104..dac5ccc9ba72 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -26,6 +26,7 @@
 #include <media/cx25840.h>
 
 #include "cx23885.h"
+#include "tuner-xc2028.h"
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -38,16 +39,16 @@ struct cx23885_board cx23885_boards[] = {
                 .input          = {{
                         .type   = CX23885_VMUX_COMPOSITE1,
                         .vmux   = 0,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE2,
                         .vmux   = 1,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE3,
                         .vmux   = 2,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE4,
                         .vmux   = 3,
-                }},
+                } },
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1800lp] = {
                 .name           = "Hauppauge WinTV-HVR1800lp",
@@ -56,19 +57,19 @@ struct cx23885_board cx23885_boards[] = {
                         .type   = CX23885_VMUX_TELEVISION,
                         .vmux   = 0,
                         .gpio0  = 0xff00,
-                },{
+                }, {
                         .type   = CX23885_VMUX_DEBUG,
                         .vmux   = 0,
                         .gpio0  = 0xff01,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE1,
                         .vmux   = 1,
                         .gpio0  = 0xff02,
-                },{
+                }, {
                         .type   = CX23885_VMUX_SVIDEO,
                         .vmux   = 2,
                         .gpio0  = 0xff02,
-                }},
+                } },
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1800] = {
                 .name           = "Hauppauge WinTV-HVR1800",
@@ -83,20 +84,20 @@ struct cx23885_board cx23885_boards[] = {
                                         CX25840_VIN5_CH2 |
                                         CX25840_VIN2_CH1,
                         .gpio0  = 0,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE1,
                         .vmux   =       CX25840_VIN7_CH3 |
                                         CX25840_VIN4_CH2 |
                                         CX25840_VIN6_CH1,
                         .gpio0  = 0,
-                },{
+                }, {
                         .type   = CX23885_VMUX_SVIDEO,
                         .vmux   =       CX25840_VIN7_CH3 |
                                         CX25840_VIN4_CH2 |
                                         CX25840_VIN8_CH1 |
                                         CX25840_SVIDEO_ON,
                         .gpio0  = 0,
-                }},
+                } },
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1250] = {
                 .name           = "Hauppauge WinTV-HVR1250",
@@ -105,19 +106,19 @@ struct cx23885_board cx23885_boards[] = {
                         .type   = CX23885_VMUX_TELEVISION,
                         .vmux   = 0,
                         .gpio0  = 0xff00,
-                },{
+                }, {
                         .type   = CX23885_VMUX_DEBUG,
                         .vmux   = 0,
                         .gpio0  = 0xff01,
-                },{
+                }, {
                         .type   = CX23885_VMUX_COMPOSITE1,
                         .vmux   = 1,
                         .gpio0  = 0xff02,
-                },{
+                }, {
                         .type   = CX23885_VMUX_SVIDEO,
                         .vmux   = 2,
                         .gpio0  = 0xff02,
-                }},
+                } },
         },
         [CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP] = {
                 .name           = "DViCO FusionHDTV5 Express",
@@ -148,6 +149,15 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP] = {
+                .name           = "DViCO FusionHDTV DVB-T Dual Express",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H] = {
+                .name           = "Leadtek Winfast PxDVR3200 H",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -159,43 +169,43 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x3400,
                 .card      = CX23885_BOARD_UNKNOWN,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7600,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1800lp,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7800,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1800,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7801,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1800,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7809,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1800,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7911,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1250,
-        },{
+        }, {
                 .subvendor = 0x18ac,
                 .subdevice = 0xd500,
                 .card      = CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7790,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7797,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7710,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500,
-        },{
+        }, {
                 .subvendor = 0x0070,
                 .subdevice = 0x7717,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1500,
@@ -215,10 +225,18 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x0070,
                 .subdevice = 0x8010,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1400,
-        },{
+        }, {
                 .subvendor = 0x18ac,
                 .subdevice = 0xd618,
                 .card      = CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,
+        }, {
+                .subvendor = 0x18ac,
+                .subdevice = 0xdb78,
+                .card      = CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,
+        }, {
+                .subvendor = 0x107d,
+                .subdevice = 0x6681,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -229,23 +247,25 @@ void cx23885_card_list(struct cx23885_dev *dev)
 
         if (0 == dev->pci->subsystem_vendor &&
             0 == dev->pci->subsystem_device) {
-                printk("%s: Your board has no valid PCIe Subsystem ID and thus can't\n"
-                       "%s: be autodetected.  Please pass card=<n> insmod option to\n"
-                       "%s: workaround that.  Redirect complaints to the vendor of\n"
-                       "%s: the TV card.  Best regards,\n"
+                printk(KERN_INFO
+                        "%s: Board has no valid PCIe Subsystem ID and can't\n"
+                       "%s: be autodetected. Pass card=<n> insmod option\n"
+                       "%s: to workaround that. Redirect complaints to the\n"
+                       "%s: vendor of the TV card.  Best regards,\n"
                        "%s:         -- tux\n",
                        dev->name, dev->name, dev->name, dev->name, dev->name);
         } else {
-                printk("%s: Your board isn't known (yet) to the driver.  You can\n"
-                       "%s: try to pick one of the existing card configs via\n"
+                printk(KERN_INFO
+                        "%s: Your board isn't known (yet) to the driver.\n"
+                       "%s: Try to pick one of the existing card configs via\n"
                        "%s: card=<n> insmod option.  Updating to the latest\n"
                        "%s: version might help as well.\n",
                        dev->name, dev->name, dev->name, dev->name);
         }
-        printk("%s: Here is a list of valid choices for the card=<n> insmod option:\n",
+        printk(KERN_INFO "%s: Here is a list of valid choices for the card=<n> insmod option:\n",
                dev->name);
         for (i = 0; i < cx23885_bcount; i++)
-                printk("%s:    card=%d -> %s\n",
+                printk(KERN_INFO "%s:    card=%d -> %s\n",
                        dev->name, i, cx23885_boards[i].name);
 }
 
@@ -253,11 +273,11 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
 {
         struct tveeprom tv;
 
-        tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, eeprom_data);
+        tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv,
+                eeprom_data);
 
         /* Make sure we support the board model */
-        switch (tv.model)
-        {
+        switch (tv.model) {
         case 71009:
                 /* WinTV-HVR1200 (PCIe, Retail, full height)
                  * DVB-T and basic analog */
@@ -285,21 +305,51 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         case 71999:
                 /* WinTV-HVR1200 (PCIe, OEM, full height)
                  * DVB-T and basic analog */
-        case 76601: /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual channel ATSC and MPEG2 HW Encoder */
-        case 77001: /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC and Basic analog */
-        case 77011: /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC and Basic analog */
-        case 77041: /* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM and Basic analog */
-        case 77051: /* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM and Basic analog */
-        case 78011: /* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */
-        case 78501: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */
-        case 78521: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */
-        case 78531: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */
-        case 78631: /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */
-        case 79001: /* WinTV-HVR1250 (PCIe, Retail, IR, full height, ATSC and Basic analog */
-        case 79101: /* WinTV-HVR1250 (PCIe, Retail, IR, half height, ATSC and Basic analog */
-        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 76601:
+                /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual
+                        channel ATSC and MPEG2 HW Encoder */
+        case 77001:
+                /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC
+                        and Basic analog */
+        case 77011:
+                /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC
+                        and Basic analog */
+        case 77041:
+                /* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM
+                        and Basic analog */
+        case 77051:
+                /* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM
+                        and Basic analog */
+        case 78011:
+                /* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM,
+                        Dual channel ATSC and MPEG2 HW Encoder */
+        case 78501:
+                /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,
+                        Dual channel ATSC and MPEG2 HW Encoder */
+        case 78521:
+                /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,
+                        Dual channel ATSC and MPEG2 HW Encoder */
+        case 78531:
+                /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM,
+                        Dual channel ATSC and MPEG2 HW Encoder */
+        case 78631:
+                /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM,
+                        Dual channel ATSC and MPEG2 HW Encoder */
+        case 79001:
+                /* WinTV-HVR1250 (PCIe, Retail, IR, full height,
+                        ATSC and Basic analog */
+        case 79101:
+                /* WinTV-HVR1250 (PCIe, Retail, IR, half height,
+                        ATSC and Basic analog */
+        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 */
@@ -311,7 +361,8 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                  * DVB-T and MPEG2 HW Encoder */
                 break;
         default:
-                printk("%s: warning: unknown hauppauge model #%d\n", dev->name, tv.model);
+                printk(KERN_WARNING "%s: warning: unknown hauppauge model #%d\n",
+                        dev->name, tv.model);
                 break;
         }
 
@@ -319,37 +370,37 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                         dev->name, tv.model);
 }
 
-/* Tuner callback function for cx23885 boards. Currently only needed
- * for HVR1500Q, which has an xc5000 tuner.
- */
-int cx23885_tuner_callback(void *priv, int command, int arg)
+int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 {
-        struct cx23885_i2c *bus = priv;
-        struct cx23885_dev *dev = bus->dev;
+        struct cx23885_tsport *port = priv;
+        struct cx23885_dev *dev = port->dev;
         u32 bitmask = 0;
 
+        if (command == XC2028_RESET_CLK)
+                return 0;
+
         if (command != 0) {
                 printk(KERN_ERR "%s(): Unknown command 0x%x.\n",
                         __func__, command);
                 return -EINVAL;
         }
 
-        switch(dev->board) {
+        switch (dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-                /* Tuner Reset Command from xc5000 */
-                if (command == 0)
-                        bitmask = 0x04;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* Tuner Reset Command */
+                bitmask = 0x04;
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
-                if (command == 0) {
-
-                        /* Two identical tuners on two different i2c buses,
-                         * we need to reset the correct gpio. */
-                        if (bus->nr == 0)
-                                bitmask = 0x01;
-                        else if (bus->nr == 1)
-                                bitmask = 0x04;
-                }
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* Two identical tuners on two different i2c buses,
+                 * we need to reset the correct gpio. */
+                if (port->nr == 0)
+                        bitmask = 0x01;
+                else if (port->nr == 1)
+                        bitmask = 0x04;
                 break;
         }
 
@@ -365,7 +416,7 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
 
 void cx23885_gpio_setup(struct cx23885_dev *dev)
 {
-        switch(dev->board) {
+        switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
                 /* GPIO-0 cx24227 demodulator reset */
                 cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
@@ -465,6 +516,32 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(20);
                 cx_set(GP0_IO, 0x000f000f);
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* GPIO-0 portb xc3028 reset */
+                /* GPIO-1 portb zl10353 reset */
+                /* GPIO-2 portc xc3028 reset */
+                /* GPIO-3 portc zl10353 reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x000f0000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x0000000f);
+                mdelay(20);
+                cx_set(GP0_IO, 0x000f000f);
+                break;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* GPIO-2  xc3028 tuner reset */
+
+                /* The following GPIO's are on the internal AVCore (cx25840) */
+                /* GPIO-?  zl10353 demod reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00040000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000004);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00040004);
+                break;
         }
 }
 
@@ -479,6 +556,9 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
                 /* FIXME: Implement me */
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                request_module("ir-kbd-i2c");
+                break;
         }
 
         return 0;
@@ -516,6 +596,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         switch (dev->board) {
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
                 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;
@@ -548,6 +629,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -561,16 +643,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
                 request_module("cx25840");
                 break;
         }
 }
 
 /* ------------------------------------------------------------------ */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
- */