Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / media / video / cx88 / cx88-cards.c
index 01413b0..f80154b 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * $Id: cx88-cards.c,v 1.47 2004/11/03 09:04:50 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
 #include <linux/pci.h>
 #include <linux/delay.h>
 
-#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
-# define WITH_DVB 1
-#endif
-
 #include "cx88.h"
-#ifdef WITH_DVB
-#include "cx22702.h"
-#endif
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -42,6 +34,9 @@ struct cx88_board cx88_boards[] = {
        [CX88_BOARD_UNKNOWN] = {
                .name           = "UNKNOWN/GENERIC",
                .tuner_type     = UNSET,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 0,
@@ -59,6 +54,10 @@ struct cx88_board cx88_boards[] = {
        [CX88_BOARD_HAUPPAUGE] = {
                .name           = "Hauppauge WinTV 34xxx models",
                .tuner_type     = UNSET,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -84,14 +83,23 @@ struct cx88_board cx88_boards[] = {
        [CX88_BOARD_GDI] = {
                .name           = "GDI Black Gold",
                .tuner_type     = UNSET,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
                }},
        },
        [CX88_BOARD_PIXELVIEW] = {
                .name           = "PixelView",
-               .tuner_type     = UNSET,
+               .tuner_type     = TUNER_PHILIPS_PAL,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -110,29 +118,35 @@ struct cx88_board cx88_boards[] = {
        },
        [CX88_BOARD_ATI_WONDER_PRO] = {
                .name           = "ATI TV Wonder Pro",
-               .tuner_type     = 44,
+               .tuner_type     = TUNER_PHILIPS_4IN1,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
-                        .gpio0  = 0x03ff,
+                       .gpio0  = 0x03ff,
                },{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
-                        .gpio0  = 0x03fe,
+                       .gpio0  = 0x03fe,
                },{
                        .type   = CX88_VMUX_SVIDEO,
                        .vmux   = 2,
-                        .gpio0  = 0x03fe,
+                       .gpio0  = 0x03fe,
                }},
        },
-        [CX88_BOARD_WINFAST2000XP] = {
-                .name           = "Leadtek Winfast 2000XP Expert",
-                .tuner_type     = 44,
+       [CX88_BOARD_WINFAST2000XP_EXPERT] = {
+               .name           = "Leadtek Winfast 2000XP Expert",
+               .tuner_type     = TUNER_PHILIPS_4IN1,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
                        .gpio0  = 0x00F5e700,
                        .gpio1  = 0x00003004,
                        .gpio2  = 0x00F5e700,
@@ -151,33 +165,37 @@ struct cx88_board cx88_boards[] = {
                        .gpio1  = 0x00003004,
                        .gpio2  = 0x00F5c700,
                        .gpio3  = 0x02000000,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
                        .gpio0  = 0x00F5d700,
                        .gpio1  = 0x00003004,
                        .gpio2  = 0x00F5d700,
                        .gpio3  = 0x02000000,
-                },
-        },
-       [CX88_BOARD_AVERTV_303] = {
+               },
+       },
+       [CX88_BOARD_AVERTV_STUDIO_303] = {
                .name           = "AverTV Studio 303 (M126)",
-               .tuner_type     = 38,
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
-                       .gpio1  = 0x309f,
+                       .gpio1  = 0xe09f,
                },{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
-                       .gpio1  = 0x305f,
+                       .gpio1  = 0xe05f,
                },{
                        .type   = CX88_VMUX_SVIDEO,
                        .vmux   = 2,
-                       .gpio1  = 0x305f,
+                       .gpio1  = 0xe05f,
                }},
                .radio = {
+                       .gpio1  = 0xe0df,
                        .type   = CX88_RADIO,
                },
        },
@@ -185,8 +203,11 @@ struct cx88_board cx88_boards[] = {
                // added gpio values thanks to Michal
                // values for PAL from DScaler
                .name           = "MSI TV-@nywhere Master",
-               .tuner_type     = 33,
-               .tda9887_conf   = TDA9887_PRESENT,
+               .tuner_type     = TUNER_MT2032,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -194,110 +215,157 @@ struct cx88_board cx88_boards[] = {
                        .gpio1  = 0x000080c0,
                        .gpio2  = 0x0000ff40,
                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
                        .gpio0  = 0x000040bf,
                        .gpio1  = 0x000080c0,
                        .gpio2  = 0x0000ff40,
                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
                        .gpio0  = 0x000040bf,
                        .gpio1  = 0x000080c0,
                        .gpio2  = 0x0000ff40,
-                }},
-                .radio = {
+               }},
+               .radio = {
                         .type   = CX88_RADIO,
-                },
+               },
        },
        [CX88_BOARD_WINFAST_DV2000] = {
-                .name           = "Leadtek Winfast DV2000",
-                .tuner_type     = 38,
+               .name           = "Leadtek Winfast DV2000",
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
-                },
-        },
-        [CX88_BOARD_LEADTEK_PVR2000] = {
-                .name           = "Leadtek PVR 2000",
-                .tuner_type     = 38,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
-                },
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x0035e700,
+                       .gpio1  = 0x00003004,
+                       .gpio2  = 0x0035e700,
+                       .gpio3  = 0x02000000,
+               },{
+
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0035c700,
+                       .gpio1  = 0x00003004,
+                       .gpio2  = 0x0035c700,
+                       .gpio3  = 0x02000000,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0035c700,
+                       .gpio1  = 0x0035c700,
+                       .gpio2  = 0x02000000,
+                       .gpio3  = 0x02000000,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .gpio0  = 0x0035d700,
+                       .gpio1  = 0x00007004,
+                       .gpio2  = 0x0035d700,
+                       .gpio3  = 0x02000000,
+                },
+       },
+       [CX88_BOARD_LEADTEK_PVR2000] = {
+               // gpio values for PAL version from regspy by DScaler
+               .name           = "Leadtek PVR 2000",
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x0000bde2,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0000bde6,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0000bde6,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .gpio0  = 0x0000bd62,
+               },
                .blackbird = 1,
-        },
+       },
        [CX88_BOARD_IODATA_GVVCP3PCI] = {
-               .name           = "IODATA GV-VCP3/PCI",
+               .name           = "IODATA GV-VCP3/PCI",
                .tuner_type     = TUNER_ABSENT,
-               .input          = {{
-                       .type   = CX88_VMUX_COMPOSITE1,
-                       .vmux   = 0,
-               },{
-                       .type   = CX88_VMUX_COMPOSITE2,
-                       .vmux   = 1,
-               },{
-                       .type   = CX88_VMUX_SVIDEO,
-                       .vmux   = 2,
-               }},
-       },
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE2,
+                       .vmux   = 1,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+               }},
+       },
        [CX88_BOARD_PROLINK_PLAYTVPVR] = {
-                .name           = "Prolink PlayTV PVR",
-                .tuner_type     = 43,
+               .name           = "Prolink PlayTV PVR",
+               .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
-                       .gpio0  = 0xff00,
+                       .gpio0  = 0xbff0,
                },{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
-                       .gpio0  = 0xff03,
+                       .gpio0  = 0xbff3,
                },{
                        .type   = CX88_VMUX_SVIDEO,
                        .vmux   = 2,
-                       .gpio0  = 0xff03,
+                       .gpio0  = 0xbff3,
                }},
                .radio = {
                        .type   = CX88_RADIO,
-                       .gpio0  = 0xff00,
+                       .gpio0  = 0xbff0,
                },
        },
        [CX88_BOARD_ASUS_PVR_416] = {
                .name           = "ASUS PVR-416",
-               .tuner_type     = 43,
-                .tda9887_conf   = TDA9887_PRESENT,
+               .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
                        .gpio0  = 0x0000fde6,
-               },{
+               },{
                        .type   = CX88_VMUX_SVIDEO,
                        .vmux   = 2,
                        .gpio0  = 0x0000fde6, // 0x0000fda6 L,R RCA audio in?
                }},
-                .radio = {
-                        .type   = CX88_RADIO,
+               .radio = {
+                       .type   = CX88_RADIO,
                        .gpio0  = 0x0000fde2,
-                },
+               },
                .blackbird = 1,
        },
        [CX88_BOARD_MSI_TVANYWHERE] = {
                .name           = "MSI TV-@nywhere",
-               .tuner_type     = 33,
+               .tuner_type     = TUNER_MT2032,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
@@ -305,35 +373,42 @@ struct cx88_board cx88_boards[] = {
                        .gpio0  = 0x00000fbf,
                        .gpio2  = 0x0000fc08,
                },{
-                       .type   = CX88_VMUX_COMPOSITE1,
-                       .vmux   = 1,
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
                        .gpio0  = 0x00000fbf,
                        .gpio2  = 0x0000fc68,
                },{
-                       .type   = CX88_VMUX_SVIDEO,
-                       .vmux   = 2,
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
                        .gpio0  = 0x00000fbf,
                        .gpio2  = 0x0000fc68,
-               }},
+               }},
        },
-        [CX88_BOARD_KWORLD_DVB_T] = {
-                .name           = "KWorld/VStream XPert DVB-T",
+       [CX88_BOARD_KWORLD_DVB_T] = {
+               .name           = "KWorld/VStream XPert DVB-T",
                .tuner_type     = TUNER_ABSENT,
-                .input          = {{
-                        .type   = CX88_VMUX_DVB,
-                        .vmux   = 0,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                }},
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               }},
                .dvb            = 1,
        },
        [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = {
-               .name           = "DVICO FusionHDTV DVB-T1",
+               .name           = "DViCO FusionHDTV DVB-T1",
                .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
@@ -347,32 +422,38 @@ struct cx88_board cx88_boards[] = {
        },
        [CX88_BOARD_KWORLD_LTV883] = {
                .name           = "KWorld LTV883RF",
-                .tuner_type     = 48,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0x07f8,
+               .tuner_type     = TUNER_TNF_8831BGFF,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x07f8,
                },{
                        .type   = CX88_VMUX_DEBUG,
                        .vmux   = 0,
                        .gpio0  = 0x07f9,  // mono from tuner chip
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0x000007fa,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0x000007fa,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
-                        .gpio0  = 0x000007f8,
-                },
-       },
-       [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD] = {
-               .name           = "DViCO - FusionHDTV 3 Gold",
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x000007fa,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x000007fa,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .gpio0  = 0x000007f8,
+               },
+       },
+       [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = {
+               .name           = "DViCO FusionHDTV 3 Gold-Q",
                .tuner_type     = TUNER_MICROTUNE_4042FI5,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                /*
                   GPIO[0] resets DT3302 DTV receiver
                    0 - reset asserted
@@ -386,6 +467,9 @@ struct cx88_board cx88_boards[] = {
                   GPIO[3] selects RF input connector on tuner module
                    0 - RF connector labeled CABLE
                    1 - RF connector labeled ANT
+                  GPIO[4] selects high RF for QAM256 mode
+                   0 - normal RF
+                   1 - high RF
                */
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
@@ -404,34 +488,38 @@ struct cx88_board cx88_boards[] = {
                        .vmux   = 2,
                        .gpio0  = 0x0f00,
                }},
-#if 0
-               .ts             = {
-                        .type   = CX88_TS,
-                        .gpio0  = 0x00000f01,   /* Hooked to tuner reset bit */
-                }
-#endif
+               .dvb            = 1,
        },
-        [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
-                .name           = "Hauppauge Nova-T DVB-T",
+       [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
+               .name           = "Hauppauge Nova-T DVB-T",
                .tuner_type     = TUNER_ABSENT,
-                .input          = {{
-                        .type   = CX88_VMUX_DVB,
-                        .vmux   = 0,
-                }},
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               }},
                .dvb            = 1,
        },
-        [CX88_BOARD_CONEXANT_DVB_T1] = {
+       [CX88_BOARD_CONEXANT_DVB_T1] = {
                .name           = "Conexant DVB-T reference design",
                .tuner_type     = TUNER_ABSENT,
-                .input          = {{
-                        .type   = CX88_VMUX_DVB,
-                        .vmux   = 0,
-                }},
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               }},
                .dvb            = 1,
        },
        [CX88_BOARD_PROVIDEO_PV259] = {
                .name           = "Provideo PV259",
                .tuner_type     = TUNER_PHILIPS_FQ1216ME,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
@@ -439,8 +527,11 @@ struct cx88_board cx88_boards[] = {
                .blackbird = 1,
        },
        [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = {
-               .name           = "DVICO FusionHDTV DVB-T Plus",
+               .name           = "DViCO FusionHDTV DVB-T Plus",
                .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
                .input          = {{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
@@ -452,6 +543,557 @@ struct cx88_board cx88_boards[] = {
                }},
                .dvb            = 1,
        },
+       [CX88_BOARD_DNTV_LIVE_DVB_T] = {
+               .name           = "digitalnow DNTV Live! DVB-T",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x00000700,
+                       .gpio2  = 0x00000101,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00000700,
+                       .gpio2  = 0x00000101,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_PCHDTV_HD3000] = {
+               .name           = "pcHDTV HD3000 HDTV",
+               .tuner_type     = TUNER_THOMSON_DTT761X,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x00008484,
+                       .gpio1  = 0x00000000,
+                       .gpio2  = 0x00000000,
+                       .gpio3  = 0x00000000,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x00008400,
+                       .gpio1  = 0x00000000,
+                       .gpio2  = 0x00000000,
+                       .gpio3  = 0x00000000,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00008400,
+                       .gpio1  = 0x00000000,
+                       .gpio2  = 0x00000000,
+                       .gpio3  = 0x00000000,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00008400,
+                       .gpio1  = 0x00000000,
+                       .gpio2  = 0x00000000,
+                       .gpio3  = 0x00000000,
+               },
+               .dvb            = 1,
+       },
+       [CX88_BOARD_HAUPPAUGE_ROSLYN] = {
+               // entry added by Kaustubh D. Bhalerao <bhalerao.1@osu.edu>
+               // GPIO values obtained from regspy, courtesy Sean Covel
+               .name           = "Hauppauge WinTV 28xxx (Roslyn) models",
+               .tuner_type     = UNSET,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0xed1a,
+                       .gpio2  = 0x00ff,
+               },{
+                       .type   = CX88_VMUX_DEBUG,
+                       .vmux   = 0,
+                       .gpio0  = 0xff01,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0xff02,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0xed92,
+                       .gpio2  = 0x00ff,
+               }},
+               .radio = {
+                        .type   = CX88_RADIO,
+                        .gpio0  = 0xed96,
+                        .gpio2  = 0x00ff,
+                },
+               .blackbird = 1,
+       },
+       [CX88_BOARD_DIGITALLOGIC_MEC] = {
+               .name           = "Digital-Logic MICROSPACE Entertainment Center (MEC)",
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x00009d80,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x00009d76,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00009d76,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .gpio0  = 0x00009d00,
+               },
+               .blackbird = 1,
+       },
+       [CX88_BOARD_IODATA_GVBCTV7E] = {
+               .name           = "IODATA GV/BCTV7E",
+               .tuner_type     = TUNER_PHILIPS_FQ1286,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 1,
+                       .gpio1  = 0x0000e03f,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 2,
+                       .gpio1  = 0x0000e07f,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 3,
+                       .gpio1  = 0x0000e07f,
+               }}
+       },
+       [CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO] = {
+               .name           = "PixelView PlayTV Ultra Pro (Stereo)",
+               /* May be also TUNER_YMEC_TVF_5533MF for NTSC/M or PAL/M */
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0xbf61,  /* internal decoder */
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0xbf63,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0xbf63,
+               }},
+               .radio = {
+                        .type  = CX88_RADIO,
+                        .gpio0 = 0xbf60,
+                },
+       },
+       [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
+               .name           = "DViCO FusionHDTV 3 Gold-T",
+               .tuner_type     = TUNER_THOMSON_DTT761X,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x97ed,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x97e9,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x97e9,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_ADSTECH_DVB_T_PCI] = {
+               .name           = "ADS Tech Instant TV DVB-T PCI",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = {
+               .name           = "TerraTec Cinergy 1400 DVB-T",
+               .tuner_type     = TUNER_ABSENT,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = {
+               .name           = "DViCO FusionHDTV 5 Gold",
+               .tuner_type     = TUNER_LG_TDVS_H062F,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x87fd,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x87f9,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x87f9,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_AVERMEDIA_ULTRATV_MC_550] = {
+               .name           = "AverMedia UltraTV Media Center PCI 550",
+               .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .blackbird      = 1,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 0,
+                       .gpio0  = 0x0000cd73,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 1,
+                       .gpio0  = 0x0000cd73,
+               },{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 3,
+                       .gpio0  = 0x0000cdb3,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0000cdf3,
+               },
+       },
+       [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = {
+                /* Alexander Wold <awold@bigfoot.com> */
+                .name           = "Kworld V-Stream Xpert DVD",
+                .tuner_type     = UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x03000000,
+                        .gpio1  = 0x01000000,
+                        .gpio2  = 0x02000000,
+                        .gpio3  = 0x00100000,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x03000000,
+                        .gpio1  = 0x01000000,
+                        .gpio2  = 0x02000000,
+                        .gpio3  = 0x00100000,
+                }},
+       },
+       [CX88_BOARD_ATI_HDTVWONDER] = {
+               .name           = "ATI HDTV Wonder",
+               .tuner_type     = TUNER_PHILIPS_TUV1236D,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x00000ff7,
+                       .gpio1  = 0x000000ff,
+                       .gpio2  = 0x00000001,
+                       .gpio3  = 0x00000000,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x00000ffe,
+                       .gpio1  = 0x000000ff,
+                       .gpio2  = 0x00000001,
+                       .gpio3  = 0x00000000,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00000ffe,
+                       .gpio1  = 0x000000ff,
+                       .gpio2  = 0x00000001,
+                       .gpio3  = 0x00000000,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_WINFAST_DTV1000] = {
+               .name           = "WinFast DTV1000-T",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_AVERTV_303] = {
+               .name           = "AVerTV 303 (M126)",
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x00ff,
+                       .gpio1  = 0xe09f,
+                       .gpio2  = 0x0010,
+                       .gpio3  = 0x0000,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x00ff,
+                       .gpio1  = 0xe05f,
+                       .gpio2  = 0x0010,
+                       .gpio3  = 0x0000,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x00ff,
+                       .gpio1  = 0xe05f,
+                       .gpio2  = 0x0010,
+                       .gpio3  = 0x0000,
+               }},
+       },
+       [CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1] = {
+               .name           = "Hauppauge Nova-S-Plus DVB-S",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_HAUPPAUGE_NOVASE2_S1] = {
+               .name           = "Hauppauge Nova-SE2 DVB-S",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_KWORLD_DVBS_100] = {
+               .name           = "KWorld DVB-S 100",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_HAUPPAUGE_HVR1100] = {
+               .name           = "Hauppauge WinTV-HVR1100 DVB-T/Hybrid",
+               .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+               }},
+               /* fixme: Add radio support */
+               .dvb            = 1,
+       },
+       [CX88_BOARD_HAUPPAUGE_HVR1100LP] = {
+               .name           = "Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)",
+               .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+               }},
+               /* fixme: Add radio support */
+               .dvb            = 1,
+       },
+       [CX88_BOARD_DNTV_LIVE_DVB_T_PRO] = {
+               .name           = "digitalnow DNTV Live! DVB-T Pro",
+               .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE |
+                                 TDA9887_PORT2_ACTIVE,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0xf80808,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0xf80808,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0xf80808,
+               }},
+               .radio = {
+                        .type  = CX88_RADIO,
+                        .gpio0 = 0xf80808,
+               },
+               .dvb            = 1,
+       },
+       [CX88_BOARD_KWORLD_DVB_T_CX22702] = {
+               /* Kworld V-stream Xpert DVB-T with Thomson tuner */
+               /* DTT 7579 Conexant CX22702-19 Conexant CX2388x  */
+               /* Manenti Marco <marco_manenti@colman.it> */
+               .name           = "KWorld/VStream XPert DVB-T with cx22702",
+               .tuner_type     = TUNER_ABSENT,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0700,
+                       .gpio2  = 0x0101,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL] = {
+               .name           = "DViCO FusionHDTV DVB-T Dual Digital",
+               .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x000027df,
+                },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x000027df,
+               }},
+               .dvb            = 1,
+       },
+       [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = {
+               /* FIXME: Standard video using the cx88 broadcast decoder is
+                * working, but blackbird isn't working yet, audio is only
+                * working correctly for television mode. S-Video and Composite
+                * are working for video-only, so I have them disabled for now.
+                */
+               .name           = "KWorld HardwareMpegTV XPert",
+               .tuner_type     = TUNER_PHILIPS_TDA8290,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x3de2,
+                       .gpio2  = 0x00ff,
+               }},
+               .radio = {
+                       .type   = CX88_RADIO,
+                       .gpio0  = 0x3de6,
+                       .gpio2  = 0x00ff,
+               },
+       },
+       [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
+               .name           = "DViCO FusionHDTV DVB-T Hybrid",
+               .tuner_type     = TUNER_THOMSON_FE6600,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x0000a75f,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x0000a75b,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x0000a75b,
+               }},
+               .dvb            = 1,
+       },
+
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -480,41 +1122,41 @@ struct cx88_subid cx88_subids[] = {
                .subdevice = 0x00f8,
                .card      = CX88_BOARD_ATI_WONDER_PRO,
        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x6611,
-                .card      = CX88_BOARD_WINFAST2000XP,
+               .subvendor = 0x107d,
+               .subdevice = 0x6611,
+               .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x6613,   /* NTSC */
-                .card      = CX88_BOARD_WINFAST2000XP,
+               .subvendor = 0x107d,
+               .subdevice = 0x6613,    /* NTSC */
+               .card      = CX88_BOARD_WINFAST2000XP_EXPERT,
+       },{
+               .subvendor = 0x107d,
+               .subdevice = 0x6620,
+               .card      = CX88_BOARD_WINFAST_DV2000,
        },{
                .subvendor = 0x107d,
-                .subdevice = 0x6620,
-                .card      = CX88_BOARD_WINFAST_DV2000,
-        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x663b,
-                .card      = CX88_BOARD_LEADTEK_PVR2000,
-        },{
-                .subvendor = 0x107d,
-                .subdevice = 0x663C,
-                .card      = CX88_BOARD_LEADTEK_PVR2000,
-        },{
+               .subdevice = 0x663b,
+               .card      = CX88_BOARD_LEADTEK_PVR2000,
+       },{
+               .subvendor = 0x107d,
+               .subdevice = 0x663C,
+               .card      = CX88_BOARD_LEADTEK_PVR2000,
+       },{
                .subvendor = 0x1461,
                .subdevice = 0x000b,
-               .card      = CX88_BOARD_AVERTV_303,
+               .card      = CX88_BOARD_AVERTV_STUDIO_303,
        },{
                .subvendor = 0x1462,
                .subdevice = 0x8606,
                .card      = CX88_BOARD_MSI_TVANYWHERE_MASTER,
        },{
-               .subvendor = 0x10fc,
-               .subdevice = 0xd003,
-               .card      = CX88_BOARD_IODATA_GVVCP3PCI,
+               .subvendor = 0x10fc,
+               .subdevice = 0xd003,
+               .card      = CX88_BOARD_IODATA_GVVCP3PCI,
        },{
-               .subvendor = 0x1043,
-               .subdevice = 0x4823,  /* with mpeg encoder */
-               .card      = CX88_BOARD_ASUS_PVR_416,
+               .subvendor = 0x1043,
+               .subdevice = 0x4823,  /* with mpeg encoder */
+               .card      = CX88_BOARD_ASUS_PVR_416,
        },{
                .subvendor = 0x17de,
                .subdevice = 0x08a6,
@@ -522,28 +1164,154 @@ struct cx88_subid cx88_subids[] = {
        },{
                .subvendor = 0x18ac,
                .subdevice = 0xd810,
-               .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
        },{
-               .subvendor = 0x18AC,
-               .subdevice = 0xDB00,
+               .subvendor = 0x18ac,
+               .subdevice = 0xd820,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb00,
                .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1,
-       },{
+       },{
                .subvendor = 0x0070,
                .subdevice = 0x9002,
                .card      = CX88_BOARD_HAUPPAUGE_DVB_T1,
-       },{
+       },{
                .subvendor = 0x14f1,
                .subdevice = 0x0187,
                .card      = CX88_BOARD_CONEXANT_DVB_T1,
-       },{
+       },{
                .subvendor = 0x1540,
                .subdevice = 0x2580,
                .card      = CX88_BOARD_PROVIDEO_PV259,
        },{
-               .subvendor = 0x18AC,
-               .subdevice = 0xDB10,
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb10,
                .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
-       }
+       },{
+               .subvendor = 0x1554,
+               .subdevice = 0x4811,
+               .card      = CX88_BOARD_PIXELVIEW,
+       },{
+               .subvendor = 0x7063,
+               .subdevice = 0x3000, /* HD-3000 card */
+               .card      = CX88_BOARD_PCHDTV_HD3000,
+       },{
+               .subvendor = 0x17de,
+               .subdevice = 0xa8a6,
+               .card      = CX88_BOARD_DNTV_LIVE_DVB_T,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x2801,
+               .card      = CX88_BOARD_HAUPPAUGE_ROSLYN,
+       },{
+               .subvendor = 0x14f1,
+               .subdevice = 0x0342,
+               .card      = CX88_BOARD_DIGITALLOGIC_MEC,
+       },{
+               .subvendor = 0x10fc,
+               .subdevice = 0xd035,
+               .card      = CX88_BOARD_IODATA_GVBCTV7E,
+       },{
+               .subvendor = 0x1421,
+               .subdevice = 0x0334,
+               .card      = CX88_BOARD_ADSTECH_DVB_T_PCI,
+       },{
+               .subvendor = 0x153b,
+               .subdevice = 0x1166,
+               .card      = CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xd500,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD,
+       },{
+               .subvendor = 0x1461,
+               .subdevice = 0x8011,
+               .card      = CX88_BOARD_AVERMEDIA_ULTRATV_MC_550,
+       },{
+               .subvendor = PCI_VENDOR_ID_ATI,
+               .subdevice = 0xa101,
+               .card      = CX88_BOARD_ATI_HDTVWONDER,
+       },{
+               .subvendor = 0x107d,
+               .subdevice = 0x665f,
+               .card      = CX88_BOARD_WINFAST_DTV1000,
+       },{
+               .subvendor = 0x1461,
+               .subdevice = 0x000a,
+               .card      = CX88_BOARD_AVERTV_303,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9200,
+               .card      = CX88_BOARD_HAUPPAUGE_NOVASE2_S1,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9201,
+               .card      = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9202,
+               .card      = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1,
+       },{
+               .subvendor = 0x17de,
+               .subdevice = 0x08b2,
+               .card      = CX88_BOARD_KWORLD_DVBS_100,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9400,
+               .card      = CX88_BOARD_HAUPPAUGE_HVR1100,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9402,
+               .card      = CX88_BOARD_HAUPPAUGE_HVR1100,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9800,
+               .card      = CX88_BOARD_HAUPPAUGE_HVR1100LP,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9802,
+               .card      = CX88_BOARD_HAUPPAUGE_HVR1100LP,
+       },{
+               .subvendor = 0x0070,
+               .subdevice = 0x9001,
+               .card      = CX88_BOARD_HAUPPAUGE_DVB_T1,
+       },{
+               .subvendor = 0x1822,
+               .subdevice = 0x0025,
+               .card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,
+       },{
+               .subvendor = 0x17de,
+               .subdevice = 0x08a1,
+               .card      = CX88_BOARD_KWORLD_DVB_T_CX22702,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb50,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb54,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL,
+               /* Re-branded DViCO: DigitalNow DVB-T Dual */
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb11,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
+               /* Re-branded DViCO: UltraView DVB-T Plus */
+       },{
+               .subvendor = 0x17de,
+               .subdevice = 0x0840,
+               .card      = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb40,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,
+       },{
+               .subvendor = 0x18ac,
+               .subdevice = 0xdb44,
+               .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,
+       },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
 
@@ -552,7 +1320,7 @@ const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
 
 static void __devinit leadtek_eeprom(struct cx88_core *core, u8 *eeprom_data)
 {
-       /* This is just for the Winfast 2000 XP board ATM; I don't have data on
+       /* This is just for the "Winfast 2000XP Expert" board ATM; I don't have data on
         * any others.
         *
         * Byte 0 is 1 on the NTSC board.
@@ -569,146 +1337,46 @@ static void __devinit leadtek_eeprom(struct cx88_core *core, u8 *eeprom_data)
        core->has_radio  = 1;
        core->tuner_type = (eeprom_data[6] == 0x13) ? 43 : 38;
 
-       printk(KERN_INFO "%s: Leadtek Winfast 2000 XP config: "
+       printk(KERN_INFO "%s: Leadtek Winfast 2000XP Expert config: "
               "tuner=%d, eeprom[0]=0x%02x\n",
               core->name, core->tuner_type, eeprom_data[0]);
 }
 
-
-/* ----------------------------------------------------------------------- */
-/* some hauppauge specific stuff                                           */
-
-static struct {
-        int  id;
-        char *name;
-} hauppauge_tuner[] __devinitdata = {
-        { TUNER_ABSENT,        "" },
-        { TUNER_ABSENT,        "External" },
-        { TUNER_ABSENT,        "Unspecified" },
-        { TUNER_PHILIPS_PAL,   "Philips FI1216" },
-        { TUNER_PHILIPS_SECAM, "Philips FI1216MF" },
-        { TUNER_PHILIPS_NTSC,  "Philips FI1236" },
-        { TUNER_PHILIPS_PAL_I, "Philips FI1246" },
-        { TUNER_PHILIPS_PAL_DK,"Philips FI1256" },
-        { TUNER_PHILIPS_PAL,   "Philips FI1216 MK2" },
-        { TUNER_PHILIPS_SECAM, "Philips FI1216MF MK2" },
-        { TUNER_PHILIPS_NTSC,  "Philips FI1236 MK2" },
-        { TUNER_PHILIPS_PAL_I, "Philips FI1246 MK2" },
-        { TUNER_PHILIPS_PAL_DK,"Philips FI1256 MK2" },
-        { TUNER_TEMIC_NTSC,    "Temic 4032FY5" },
-        { TUNER_TEMIC_PAL,     "Temic 4002FH5" },
-        { TUNER_TEMIC_PAL_I,   "Temic 4062FY5" },
-        { TUNER_PHILIPS_PAL,   "Philips FR1216 MK2" },
-        { TUNER_PHILIPS_SECAM, "Philips FR1216MF MK2" },
-        { TUNER_PHILIPS_NTSC,  "Philips FR1236 MK2" },
-        { TUNER_PHILIPS_PAL_I, "Philips FR1246 MK2" },
-        { TUNER_PHILIPS_PAL_DK,"Philips FR1256 MK2" },
-        { TUNER_PHILIPS_PAL,   "Philips FM1216" },
-        { TUNER_PHILIPS_SECAM, "Philips FM1216MF" },
-        { TUNER_PHILIPS_NTSC,  "Philips FM1236" },
-        { TUNER_PHILIPS_PAL_I, "Philips FM1246" },
-        { TUNER_PHILIPS_PAL_DK,"Philips FM1256" },
-        { TUNER_TEMIC_4036FY5_NTSC, "Temic 4036FY5" },
-        { TUNER_ABSENT,        "Samsung TCPN9082D" },
-        { TUNER_ABSENT,        "Samsung TCPM9092P" },
-        { TUNER_TEMIC_4006FH5_PAL, "Temic 4006FH5" },
-        { TUNER_ABSENT,        "Samsung TCPN9085D" },
-        { TUNER_ABSENT,        "Samsung TCPB9085P" },
-        { TUNER_ABSENT,        "Samsung TCPL9091P" },
-        { TUNER_TEMIC_4039FR5_NTSC, "Temic 4039FR5" },
-        { TUNER_PHILIPS_FQ1216ME,   "Philips FQ1216 ME" },
-        { TUNER_TEMIC_4066FY5_PAL_I, "Temic 4066FY5" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
-       { TUNER_PHILIPS_NTSC,  "Philips FMR1236" }, /* mono radio */
-        { TUNER_ABSENT,        "Philips FI1256MP" },
-        { TUNER_ABSENT,        "Samsung TCPQ9091P" },
-        { TUNER_TEMIC_4006FN5_MULTI_PAL, "Temic 4006FN5" },
-        { TUNER_TEMIC_4009FR5_PAL, "Temic 4009FR5" },
-        { TUNER_TEMIC_4046FM5,     "Temic 4046FM5" },
-       { TUNER_TEMIC_4009FN5_MULTI_PAL_FM, "Temic 4009FN5" },
-       { TUNER_ABSENT,        "Philips TD1536D_FH_44"},
-       { TUNER_LG_NTSC_FM,    "LG TPI8NSR01F"},
-       { TUNER_LG_PAL_FM,     "LG TPI8PSB01D"},
-       { TUNER_LG_PAL,        "LG TPI8PSB11D"},
-       { TUNER_LG_PAL_I_FM,   "LG TAPC-I001D"},
-       { TUNER_LG_PAL_I,      "LG TAPC-I701D"}
-};
-
 static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
 {
-       unsigned int blk2,tuner,radio,model;
-
-       if (eeprom_data[0] != 0x84 || eeprom_data[2] != 0) {
-               printk(KERN_WARNING "%s: Hauppauge eeprom: invalid\n",
-                      core->name);
-               return;
-       }
-
-       /* Block 2 starts after len+3 bytes header */
-       blk2 = eeprom_data[1] + 3;
-
-       /* decode + use some config infos */
-       model = eeprom_data[12] << 8 | eeprom_data[11];
-       tuner = eeprom_data[9];
-       radio = eeprom_data[blk2-1] & 0x01;
-
-        if (tuner < ARRAY_SIZE(hauppauge_tuner))
-                core->tuner_type = hauppauge_tuner[tuner].id;
-       if (radio)
-               core->has_radio = 1;
-
-       printk(KERN_INFO "%s: hauppauge eeprom: model=%d, "
-              "tuner=%s (%d), radio=%s\n",
-              core->name, model, (tuner < ARRAY_SIZE(hauppauge_tuner)
-                                  ? hauppauge_tuner[tuner].name : "?"),
-              core->tuner_type, radio ? "yes" : "no");
-}
+       struct tveeprom tv;
 
-#ifdef WITH_DVB
-static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee)
-{
-       int model;
-       int tuner;
-       char *tname;
+       tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data);
+       core->tuner_type = tv.tuner_type;
+       core->tuner_formats = tv.tuner_formats;
+       core->has_radio  = tv.has_radio;
 
        /* Make sure we support the board model */
-       model = ee[0x1f] << 24 | ee[0x1e] << 16 | ee[0x1d] << 8 | ee[0x1c];
-       switch(model) {
-       case 90002:
-       case 90500:
-       case 90501:
+       switch (tv.model)
+       {
+       case 28552: /* WinTV-PVR 'Roslyn' (No IR) */
+       case 34519: /* WinTV-PCI-FM */
+       case 90002: /* Nova-T-PCI (9002) */
+       case 92001: /* Nova-S-Plus (Video and IR) */
+       case 92002: /* Nova-S-Plus (Video and IR) */
+       case 90003: /* Nova-T-PCI (9002 No RF out) */
+       case 90500: /* Nova-T-PCI (oem) */
+       case 90501: /* Nova-T-PCI (oem/IR) */
+       case 92000: /* Nova-SE2 (OEM, No Video or IR) */
+       case 94009: /* WinTV-HVR1100 (Video and IR Retail) */
+       case 94501: /* WinTV-HVR1100 (Video and IR OEM) */
+       case 98559: /* WinTV-HVR1100LP (Video no IR, Retail - Low Profile) */
                /* known */
                break;
        default:
                printk("%s: warning: unknown hauppauge model #%d\n",
-                      core->name, model);
+                      core->name, tv.model);
                break;
        }
 
-       /* Make sure we support the tuner */
-       tuner = ee[0x2d];
-       switch(tuner) {
-       case 0x4B:
-               tname = "Thomson DTT 7595";
-               core->pll_type = PLLTYPE_DTT7595;
-               break;
-       case 0x4C:
-               tname = "Thomson DTT 7592";
-               core->pll_type = PLLTYPE_DTT7592;
-               break;
-       default:
-               printk("%s: error: unknown hauppauge tuner 0x%02x\n",
-                      core->name, tuner);
-               return -ENODEV;
-       }
-       printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%s (%d)\n",
-              core->name, model, tname, tuner);
-
-       core->pll_addr = 0x61;
-       core->demod_addr = 0x43;
+       printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n",
+                       core->name, tv.model);
 }
-#endif
 
 /* ----------------------------------------------------------------------- */
 /* some GDI (was: Modular Technology) specific stuff                       */
@@ -762,37 +1430,41 @@ static void gdi_eeprom(struct cx88_core *core, u8 *eeprom_data)
 }
 
 /* ----------------------------------------------------------------------- */
+/* some DViCO specific stuff                                               */
 
-static int
-i2c_eeprom(struct i2c_client *c, unsigned char *eedata, int len)
+static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core)
 {
-       unsigned char buf;
-       int err;
-
-       c->addr = 0xa0 >> 1;
-       buf = 0;
-       if (1 != (err = i2c_master_send(c,&buf,1))) {
-               printk(KERN_INFO "cx88: Huh, no eeprom present (err=%d)?\n",
-                      err);
-               return -1;
-       }
-       if (len != (err = i2c_master_recv(c,eedata,len))) {
-               printk(KERN_WARNING "cx88: i2c eeprom read error (err=%d)\n",
-                      err);
-               return -1;
-       }
-#if 0
-       for (i = 0; i < len; i++) {
-               if (0 == (i % 16))
-                       printk(KERN_INFO "cx88 ee: %02x:",i);
-               printk(" %02x",eedata[i]);
-               if (15 == (i % 16))
-                       printk("\n");
+       struct i2c_msg msg = { .addr = 0x45, .flags = 0 };
+       int i, err;
+       static u8 init_bufs[13][5] = {
+               { 0x10, 0x00, 0x20, 0x01, 0x03 },
+               { 0x10, 0x10, 0x01, 0x00, 0x21 },
+               { 0x10, 0x10, 0x10, 0x00, 0xCA },
+               { 0x10, 0x10, 0x12, 0x00, 0x08 },
+               { 0x10, 0x10, 0x13, 0x00, 0x0A },
+               { 0x10, 0x10, 0x16, 0x01, 0xC0 },
+               { 0x10, 0x10, 0x22, 0x01, 0x3D },
+               { 0x10, 0x10, 0x73, 0x01, 0x2E },
+               { 0x10, 0x10, 0x72, 0x00, 0xC5 },
+               { 0x10, 0x10, 0x71, 0x01, 0x97 },
+               { 0x10, 0x10, 0x70, 0x00, 0x0F },
+               { 0x10, 0x10, 0xB0, 0x00, 0x01 },
+               { 0x03, 0x0C },
+       };
+
+       for (i = 0; i < 13; i++) {
+               msg.buf = init_bufs[i];
+               msg.len = (i != 12 ? 5 : 2);
+               err = i2c_transfer(&core->i2c_adap, &msg, 1);
+               if (err != 1) {
+                       printk("dvico_fusionhdtv_hybrid_init buf %d failed (err = %d)!\n", i, err);
+                       return;
+               }
        }
-#endif
-       return 0;
 }
 
+/* ----------------------------------------------------------------------- */
+
 void cx88_card_list(struct cx88_core *core, struct pci_dev *pci)
 {
        int i;
@@ -821,43 +1493,77 @@ void cx88_card_list(struct cx88_core *core, struct pci_dev *pci)
 
 void cx88_card_setup(struct cx88_core *core)
 {
-       static u8 eeprom[128];
+       static u8 eeprom[256];
+
+       if (0 == core->i2c_rc) {
+               core->i2c_client.addr = 0xa0 >> 1;
+               tveeprom_read(&core->i2c_client,eeprom,sizeof(eeprom));
+       }
 
        switch (core->board) {
        case CX88_BOARD_HAUPPAUGE:
+       case CX88_BOARD_HAUPPAUGE_ROSLYN:
                if (0 == core->i2c_rc)
-                       i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
-               hauppauge_eeprom(core,eeprom+8);
+                       hauppauge_eeprom(core,eeprom+8);
                break;
        case CX88_BOARD_GDI:
                if (0 == core->i2c_rc)
-                       i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
-               gdi_eeprom(core,eeprom);
+                       gdi_eeprom(core,eeprom);
                break;
-       case CX88_BOARD_WINFAST2000XP:
+       case CX88_BOARD_WINFAST2000XP_EXPERT:
                if (0 == core->i2c_rc)
-                       i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
-               leadtek_eeprom(core,eeprom);
+                       leadtek_eeprom(core,eeprom);
+               break;
+       case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
+       case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
+       case CX88_BOARD_HAUPPAUGE_DVB_T1:
+       case CX88_BOARD_HAUPPAUGE_HVR1100:
+       case CX88_BOARD_HAUPPAUGE_HVR1100LP:
+               if (0 == core->i2c_rc)
+                       hauppauge_eeprom(core,eeprom);
+               break;
+       case CX88_BOARD_KWORLD_DVBS_100:
+               cx_write(MO_GP0_IO, 0x000007f8);
+               cx_write(MO_GP1_IO, 0x00000001);
                break;
        case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
-               /* Tuner reset is hooked to  the tuner out of reset */
+       case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+       case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
+       case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
+               /* GPIO0:0 is hooked to mt352 reset pin */
                cx_set(MO_GP0_IO, 0x00000101);
                cx_clear(MO_GP0_IO, 0x00000001);
                msleep(1);
                cx_set(MO_GP0_IO, 0x00000101);
+               if (0 == core->i2c_rc &&
+                   core->board == CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID)
+                       dvico_fusionhdtv_hybrid_init(core);
                break;
-#ifdef WITH_DVB
-       case CX88_BOARD_HAUPPAUGE_DVB_T1:
-               if (0 == core->i2c_rc)
-                       i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
-               hauppauge_eeprom_dvb(core,eeprom);
+       case CX88_BOARD_KWORLD_DVB_T:
+       case CX88_BOARD_DNTV_LIVE_DVB_T:
+               cx_set(MO_GP0_IO, 0x00000707);
+               cx_set(MO_GP2_IO, 0x00000101);
+               cx_clear(MO_GP2_IO, 0x00000001);
+               msleep(1);
+               cx_clear(MO_GP0_IO, 0x00000007);
+               cx_set(MO_GP2_IO, 0x00000101);
+               break;
+       case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
+               cx_write(MO_GP0_IO, 0x00080808);
                break;
-       case CX88_BOARD_CONEXANT_DVB_T1:
-               core->pll_type   = PLLTYPE_DTT7579;
-               core->pll_addr   = 0x60;
-               core->demod_addr = 0x43;
+       case CX88_BOARD_ATI_HDTVWONDER:
+               if (0 == core->i2c_rc) {
+                       /* enable tuner */
+                       int i;
+                       static const u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 };
+                       core->i2c_client.addr = 0x0a;
+
+                       for (i = 0; i < 5; i++)
+                               if (2 != i2c_master_send(&core->i2c_client,&buffer[i*2],2))
+                                       printk(KERN_WARNING "%s: Unable to enable tuner(%i).\n",
+                                               core->name, i);
+               }
                break;
-#endif
        }
        if (cx88_boards[core->board].radio.type == CX88_RADIO)
                core->has_radio = 1;
@@ -876,4 +1582,5 @@ EXPORT_SYMBOL(cx88_card_setup);
  * 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
  */