Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b5457b7bdf284d683880163a4c59fdde2f84325a
Commit:     b5457b7bdf284d683880163a4c59fdde2f84325a
Parent:     13595a51c0da8ec212ba6f5df79519dbd74166c0
Author:     Sascha Sommer <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 12:23:39 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:14:55 2007 -0300

    V4L/DVB (6249): Add Typhoon Tv-Tuner PCI to bttv-cards.c
    
    Adds an entry for the Typhoon Tv-Tuner PCI to bttv-cards.c
    
    Signed-off-by: Sascha Sommer <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 Documentation/video4linux/CARDLIST.bttv |    1 +
 drivers/media/video/bt8xx/bttv-cards.c  |   17 +++++++++++++++++
 drivers/media/video/bt8xx/bttv.h        |    2 ++
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/Documentation/video4linux/CARDLIST.bttv 
b/Documentation/video4linux/CARDLIST.bttv
index 177159c..d97cf7c 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -147,3 +147,4 @@
 146 -> SSAI Ultrasound Video Interface                     [414a:5353]
 147 -> VoodooTV 200 (USA)                                  [121a:3000]
 148 -> DViCO FusionHDTV 2                                  [dbc0:d200]
+149 -> Typhoon TV-Tuner PCI (50684)
diff --git a/drivers/media/video/bt8xx/bttv-cards.c 
b/drivers/media/video/bt8xx/bttv-cards.c
index 900d18e..dd6a7d6 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2988,6 +2988,23 @@ struct tvcard bttv_tvcards[] = {
                .no_tda9875     = 1,
                .no_tda7432     = 1,
        },
+       /* ---- card 0x95---------------------------------- */
+       [BTTV_BOARD_TYPHOON_TVTUNERPCI] = {
+               .name           = "Typhoon TV-Tuner PCI (50684)",
+               .video_inputs   = 3,
+               .audio_inputs   = 1,
+               .tuner          = 0,
+               .svhs           = 2,
+               .gpiomask       = 0x3014f,
+               .muxsel         = { 2, 3, 1, 1 },
+               .gpiomux        = { 0x20001,0x10001, 0, 0 },
+               .gpiomute       = 10,
+               .needs_tvaudio  = 1,
+               .pll            = PLL_28,
+               .tuner_type     = TUNER_PHILIPS_PAL_I,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+       },
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index dcc847d..19e75d5 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -172,6 +172,8 @@
 #define BTTV_BOARD_SSAI_ULTRASOUND        0x92
 #define BTTV_BOARD_VOODOOTV_200                   0x93
 #define BTTV_BOARD_DVICO_FUSIONHDTV_2     0x94
+#define BTTV_BOARD_TYPHOON_TVTUNERPCI     0x95
+
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to