vserver 1.9.5.x5
[linux-2.6.git] / drivers / media / video / saa7134 / saa7134-cards.c
index 5bb99d7..53bce03 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id: saa7134-cards.c,v 1.35 2004/11/07 14:44:59 kraxel Exp $
+ *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
  *
@@ -154,6 +156,26 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x8000,
                },
        },
+       [SAA7134_BOARD_FLYTVPLATINUM] = {
+               /* "Arnaud Quette" <aquette@free.fr> */
+               .name           = "LifeView FlyTV Platinum",
+               .audio_clock    = 0x00200000,
+               .tuner_type     = TUNER_PHILIPS_SECAM,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = LINE2,
+                       .tv   = 1,
+               },{
+                       .name = name_comp1,
+                       .vmux = 0,
+                       .amux = LINE2,
+               },{
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE2,
+               }},
+       },
        [SAA7134_BOARD_EMPRESS] = {
                /* "Gert Vervoort" <gert.vervoort@philips.com> */
                .name           = "EMPRESS",
@@ -177,8 +199,7 @@ struct saa7134_board saa7134_boards[] = {
                        .name = name_radio,
                        .amux = LINE2,
                },
-               .i2s_rate  = 48000,
-               .has_ts    = 1,
+               .mpeg      = SAA7134_MPEG_EMPRESS,
                .video_out = CCIR656,
        },
        [SAA7134_BOARD_MONSTERTV] = {
@@ -243,7 +264,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "KNC One TV-Station RDS / Typhoon TV Tuner RDS",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -278,7 +299,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "KNC One TV-Station DVR",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x820000,
                .inputs         = {{
                        .name = name_tv,
@@ -302,8 +323,7 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = LINE2,
                        .gpio = 0x20000,
                },
-               .i2s_rate       = 48000,
-               .has_ts         = 1,
+               .mpeg           = SAA7134_MPEG_EMPRESS,
                .video_out      = CCIR656,
        },
        [SAA7134_BOARD_CINERGY400] = {
@@ -333,7 +353,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "Medion 5044",
                .audio_clock    = 0x00187de7, // was: 0x00200000,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -386,6 +406,7 @@ struct saa7134_board saa7134_boards[] = {
                 .name           = "Terratec Cinergy 600 TV",
                 .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_PHILIPS_PAL,
+               .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
@@ -414,7 +435,7 @@ struct saa7134_board saa7134_boards[] = {
                //.audio_clock    = 0x00200000,
                .audio_clock    = 0x00187de7,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs = {{
                        .name   = name_tv,
                        .vmux   = 1,
@@ -440,7 +461,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "Typhoon TV+Radio 90031",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_PAL,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name   = name_tv,
                        .vmux   = 1,
@@ -503,7 +524,7 @@ struct saa7134_board saa7134_boards[] = {
                 .name           = "ASUS TV-FM 7134",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-                .need_tda9887   = 1,
+                .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
@@ -607,8 +628,7 @@ struct saa7134_board saa7134_boards[] = {
                        .vmux = 8,
                        .amux = LINE1,
                }},
-               .i2s_rate  = 48000,
-               .has_ts    = 1,
+               .mpeg      = SAA7134_MPEG_EMPRESS,
                .video_out = CCIR656,
        },
        [SAA7134_BOARD_VIDEOMATE_TV] = {
@@ -630,6 +650,29 @@ struct saa7134_board saa7134_boards[] = {
                         .tv   = 1,
                 }},
         },
+    [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS] = {
+               .name           = "Compro VideoMate TV Gold+",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_NTSC_M,
+               .gpiomask       = 0x800c0000,
+                .inputs         = {{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x06c00012,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x0ac20012,
+                },{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x08c20012,
+                        .tv   = 1,
+                }},
+        },
        [SAA7134_BOARD_CRONOS_PLUS] = {
                /* gpio pins:
                   0  .. 3   BASE_ID
@@ -666,7 +709,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "AverMedia M156 / Medion 2819",
                .audio_clock    = 0x00187de7,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -709,8 +752,7 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = LINE2,
                        .tv   = 1,
                }},
-               .i2s_rate  = 48000,
-               .has_ts    = 1,
+               .mpeg      = SAA7134_MPEG_EMPRESS,
                .video_out = CCIR656,
         },
         [SAA7134_BOARD_ASUSTEK_TVFM7133] = {
@@ -719,7 +761,7 @@ struct saa7134_board saa7134_boards[] = {
                // probably wrong, the 7133 one is the NTSC version ...
                // .tuner_type     = TUNER_PHILIPS_FM1236_MK3
                 .tuner_type     = TUNER_LG_NTSC_NEW_TAPC,
-                .need_tda9887   = 1,
+                .tda9887_conf   = TDA9887_PRESENT,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
@@ -743,7 +785,7 @@ struct saa7134_board saa7134_boards[] = {
                 .name           = "Pinnacle PCTV Stereo (saa7134)",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_MT2032,
-                .need_tda9887   = 1,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 3,
@@ -796,7 +838,7 @@ struct saa7134_board saa7134_boards[] = {
                        .name = name_svideo,
                        .vmux = 8,
                        .amux = LINE1,
-               },{                     
+               },{
                        .name = name_comp1,
                        .vmux = 1,
                        .amux = LINE1,
@@ -957,7 +999,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "AverMedia 305",
                .audio_clock    = 0x00187de7,
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -989,7 +1031,7 @@ struct saa7134_board saa7134_boards[] = {
                .name           = "UPMOST PURPLE TV",
                .audio_clock    = 0x00187de7,
                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
-               .need_tda9887   = 1,
+               .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 7,
@@ -1000,7 +1042,7 @@ struct saa7134_board saa7134_boards[] = {
                        .vmux = 7,
                        .amux = LINE1,
                }},
-          },
+       },
        [SAA7134_BOARD_ITEMS_MTV005] = {
                /* Norman Jonas <normanjonas@arcor.de> */
                .name           = "Items MuchTV Plus / IT-005",
@@ -1025,6 +1067,217 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = LINE2,
                },
        },
+       [SAA7134_BOARD_CINERGY200] = {
+               .name           = "Terratec Cinergy 200 TV",
+               .audio_clock    = 0x00200000,
+               .tuner_type     = TUNER_PHILIPS_PAL,
+               .inputs         = {{
+                               .name = name_tv,
+                       .vmux = 1,
+                       .amux = LINE2,
+                       .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 4,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                },{
+                        .name = name_comp2, // CVideo over SVideo Connector
+                        .vmux = 0,
+                        .amux = LINE1,
+               }},
+               .mute = {
+                        .name = name_mute,
+                        .amux = LINE2,
+               },
+       },
+       [SAA7134_BOARD_VIDEOMATE_TV_PVR] = {
+               /* Alain St-Denis <alain@topaze.homeip.net> */
+               .name           = "Compro VideoMate TV PVR/FM",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_NTSC_M,
+               .gpiomask       = 0x808c0080,
+                .inputs         = {{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                       .gpio = 0x00080
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                       .gpio = 0x00080
+                },{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .tv   = 1,
+                       .gpio = 0x00080
+                }},
+               .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                       .gpio = 0x80000
+                },
+               .mute = {
+                       .name = name_mute,
+                        .amux = LINE2,
+                       .gpio = 0x40000,
+               },
+        },
+        [SAA7134_BOARD_SABRENT_SBTTVFM] = {
+               /* Michael Rodriguez-Torrent */
+                .name           = "Sabrent SBT-TVFM (saa7130)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_NTSC_M,
+               .tda9887_conf   = TDA9887_PRESENT,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 3,
+                        .amux = LINE2,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 1,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE2,
+                },
+        },
+       [SAA7134_BOARD_ZOLID_XPERT_TV7134] = {
+               /* Helge Jensen <helge.jensen@slog.dk> */
+                .name           = ":Zolid Xpert TV7134",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_NTSC,
+                .inputs         = {{
+                       .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .tv   = 1,
+                }},
+       },
+       [SAA7134_BOARD_EMPIRE_PCI_TV_RADIO_LE] = {
+               /* "Matteo Az" <matte.az@nospam.libero.it> ;-) */
+               .name           = "Empire PCI TV-Radio LE",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_PAL,
+               .gpiomask       = 0x4000,
+               .inputs         = {{
+                       .name = name_tv_mono,
+                       .vmux = 1,
+                       .amux = LINE2,
+                       .gpio = 0x8000,
+                       .tv   = 1,
+               },{
+                       .name = name_comp1,
+                       .vmux = 3,
+                       .amux = LINE1,
+                       .gpio = 0x8000,
+               },{
+                       .name = name_svideo,
+                       .vmux = 6,
+                       .amux = LINE1,
+                       .gpio = 0x8000,
+               }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE1,
+                        .gpio = 0x8000,
+                },
+               .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio =0x8000,
+                }
+       },
+        [SAA7134_BOARD_AVERMEDIA_307] = {
+               /* Nickolay V. Shmyrev <nshmyrev@yandex.ru> */
+               .name           = "Avermedia AVerTV Studio 307",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = TV,
+                       .tv   = 1,
+               },{
+                       .name = name_comp1,
+                       .vmux = 0,
+                       .amux = LINE2,
+               },{
+                       .name = name_comp2,
+                       .vmux = 3,
+                       .amux = LINE2,
+               },{
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE2,
+               }},
+               .radio = {
+                       .name = name_radio,
+                       .amux = TV,
+               },
+        },
+       [SAA7134_BOARD_AVERMEDIA_CARDBUS] = {
+               /* Jon Westgate <oryn@oryn.fsck.tv> */
+               .name           = "AVerMedia Cardbus TV/Radio",
+               .audio_clock    = 0x00200000,
+               .tuner_type     = TUNER_PHILIPS_PAL,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = LINE2,
+                       .tv   = 1,
+               },{
+                       .name = name_comp1,
+                       .vmux = 3,
+                       .amux = LINE2,
+               },{
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE2,
+               }},
+               .radio = {
+                       .name = name_radio,
+                       .amux = LINE1,
+               },
+       },
+       [SAA7134_BOARD_CINERGY400_CARDBUS] = {
+               .name           = "Terratec Cinergy 400 mobile",
+               .audio_clock    = 0x187de7,
+               .tuner_type     = UNSET /* not supported yet :/ */,
+               .inputs         = {{
+                               .name = name_tv,
+                       .vmux = 5,
+                       .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 4,
+                        .amux = LINE1,
+               }},
+       },
 };
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
 
@@ -1068,6 +1321,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x153B,
                 .subdevice    = 0x1143,
                 .driver_data  = SAA7134_BOARD_CINERGY600,
+        },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x153b,
+               .subdevice    = 0x1162,
+               .driver_data  = SAA7134_BOARD_CINERGY400_CARDBUS,
         },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -1086,6 +1345,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x5168,
                .subdevice    = 0x0138,
                .driver_data  = SAA7134_BOARD_FLYVIDEO2000,
+        },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7135,
+               .subvendor    = 0x5168,
+               .subdevice    = 0x0212,
+               .driver_data  = SAA7134_BOARD_FLYTVPLATINUM,
         },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -1164,6 +1429,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x185b,
                 .subdevice    = 0xc100,
                .driver_data  = SAA7134_BOARD_VIDEOMATE_TV,
+        },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x185b,
+                .subdevice    = 0xc100,
+               .driver_data  = SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS,
         },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -1189,6 +1460,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x10ff,
                .driver_data  = SAA7134_BOARD_AVERMEDIA_DVD_EZMAKER,
         },{
+               /* AVerMedia CardBus */
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+                .subdevice    = 0xd6ee,
+               .driver_data  = SAA7134_BOARD_AVERMEDIA_CARDBUS,
+       },{
                /* TransGear 3000TV */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -1201,6 +1479,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x11bd,
                 .subdevice    = 0x002b,
                 .driver_data  = SAA7134_BOARD_PINNACLE_PCTV_STEREO,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x11bd,
+                .subdevice    = 0x002d, /* 300i DVB-T + PAL */
+                .driver_data  = SAA7134_BOARD_PINNACLE_PCTV_STEREO,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -1219,7 +1503,27 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x12ab,
                 .subdevice    = 0x0800,
                .driver_data  = SAA7133_BOARD_UPMOST_PURPLE_TV,
-               
+       },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+               .subvendor    = 0x153B,
+               .subdevice    = 0x1152,
+               .driver_data  = SAA7134_BOARD_CINERGY200,
+
+       },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x185b,
+                .subdevice    = 0xc100,
+               .driver_data  = SAA7134_BOARD_VIDEOMATE_TV_PVR,
+
+       },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+               .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+               .subdevice    = 0x9715,
+               .driver_data  = SAA7134_BOARD_AVERMEDIA_307,
+
        },{
                /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -1234,7 +1538,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subdevice    = 0,
                .driver_data  = SAA7134_BOARD_NOAUTO,
        },{
-               
+
                /* --- default catch --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -1297,6 +1601,7 @@ static struct {
 static void board_flyvideo(struct saa7134_dev *dev)
 {
 #if 0
+       /* non-working attempt to detect the correct tuner type ... */
        u32 value;
        int index;
 
@@ -1307,11 +1612,15 @@ static void board_flyvideo(struct saa7134_dev *dev)
               fly_list[index].tuner_type);
        dev->tuner_type = fly_list[index].tuner_type;
 #endif
+       printk("%s: there are different flyvideo cards with different tuners\n"
+              "%s: out there, you might have to use the tuner=<nr> insmod\n"
+              "%s: option to override the default value.\n",
+              dev->name, dev->name, dev->name);
 }
 
 /* ----------------------------------------------------------- */
 
-int saa7134_board_init(struct saa7134_dev *dev)
+int saa7134_board_init1(struct saa7134_dev *dev)
 {
        // Always print gpio, often manufacturers encode tuner type and other info.
        saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0);
@@ -1321,18 +1630,58 @@ int saa7134_board_init(struct saa7134_dev *dev)
        switch (dev->board) {
        case SAA7134_BOARD_FLYVIDEO2000:
        case SAA7134_BOARD_FLYVIDEO3000:
-               board_flyvideo(dev);
                dev->has_remote = 1;
+               /* fall throuth */
+       case SAA7134_BOARD_FLYTVPLATINUM:
+               board_flyvideo(dev);
                break;
        case SAA7134_BOARD_CINERGY400:
        case SAA7134_BOARD_CINERGY600:
        case SAA7134_BOARD_ECS_TVP3XP:
        case SAA7134_BOARD_ECS_TVP3XP_4CB5:
+       case SAA7134_BOARD_MD2819:
+       case SAA7134_BOARD_AVERMEDIA_307:
                dev->has_remote = 1;
                break;
        case SAA7134_BOARD_AVACSSMARTTV:
                dev->has_remote = 1;
                break;
+       case SAA7134_BOARD_MD5044:
+               printk("%s: seems there are two different versions of the MD5044\n"
+                      "%s: (with the same ID) out there.  If sound doesn't work for\n"
+                      "%s: you try the audio_clock_override=0x200000 insmod option.\n",
+                      dev->name,dev->name,dev->name);
+               break;
+       case SAA7134_BOARD_CINERGY400_CARDBUS:
+               /* power-up tuner chip */
+               saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
+               saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
+               break;
+       }
+       return 0;
+}
+
+/* stuff which needs working i2c */
+int saa7134_board_init2(struct saa7134_dev *dev)
+{
+       unsigned char buf;
+       int board;
+
+       switch (dev->board) {
+       case SAA7134_BOARD_BMK_MPEX_NOTUNER:
+       case SAA7134_BOARD_BMK_MPEX_TUNER:
+               dev->i2c_client.addr = 0x60;
+               board = (i2c_master_recv(&dev->i2c_client,&buf,0) < 0)
+                       ? SAA7134_BOARD_BMK_MPEX_NOTUNER
+                       : SAA7134_BOARD_BMK_MPEX_TUNER;
+               if (board == dev->board)
+                       break;
+               printk("%s: board type fixup: %s\n", dev->name,
+                      saa7134_boards[dev->board].name);
+               dev->tuner_type = saa7134_boards[dev->board].tuner_type;
+               if (TUNER_ABSENT != dev->tuner_type)
+                       saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&dev->tuner_type);
+               break;
        }
        return 0;
 }