From c60cb36183e710dfe80b3dee47673831171de212 Mon Sep 17 00:00:00 2001 From: "nshmyrev@yandex.ru" Date: Tue, 8 Nov 2005 21:37:38 -0800 Subject: [PATCH] --- yaml --- r: 13365 b: refs/heads/master c: 71633c05724d85f1afb87629bb96fdf2ef18b41f h: refs/heads/master i: 13363: b43b26ff624880cdde0880f9673e1b34f0ae53c4 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.bttv | 1 + trunk/drivers/media/video/bttv-cards.c | 17 +++++++++++++++++ trunk/drivers/media/video/bttv.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e2ca7f2879e1..896b17aeeb9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f2e6229f6f7b89cb42f4942cb46dc645faae2a +refs/heads/master: 71633c05724d85f1afb87629bb96fdf2ef18b41f diff --git a/trunk/Documentation/video4linux/CARDLIST.bttv b/trunk/Documentation/video4linux/CARDLIST.bttv index ba98ff4a79af..2404099996ac 100644 --- a/trunk/Documentation/video4linux/CARDLIST.bttv +++ b/trunk/Documentation/video4linux/CARDLIST.bttv @@ -139,3 +139,4 @@ 138 -> Prolink Pixelview PV-BT878P+ (Rev.2E) 139 -> Prolink PixelView PlayTV MPEG2 PV-M4900 140 -> Osprey 440 [0070:ff07] +141 -> Asound Skyeye PCTV diff --git a/trunk/drivers/media/video/bttv-cards.c b/trunk/drivers/media/video/bttv-cards.c index 2b19de386dcf..8544a8fa2a5c 100644 --- a/trunk/drivers/media/video/bttv-cards.c +++ b/trunk/drivers/media/video/bttv-cards.c @@ -2781,6 +2781,23 @@ struct tvcard bttv_tvcards[] = { .no_tda9875 = 1, .no_tda7432 = 1, }, + /* ---- card 0x8d ---------------------------------- */ + [BTTV_BOARD_ASOUND_SKYEYE] = { + .name = "Asound Skyeye PCTV", + .video_inputs = 3, + .audio_inputs = 1, + .tuner = 0, + .svhs = 2, + .gpiomask = 15, + .muxsel = { 2, 3, 1, 1}, + .audiomux = {2,0,0,0,1}, + .needs_tvaudio = 1, + .pll = PLL_28, + .tuner_type = 2, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + }, + }; static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); diff --git a/trunk/drivers/media/video/bttv.h b/trunk/drivers/media/video/bttv.h index ffece3b91360..26cd117a6df4 100644 --- a/trunk/drivers/media/video/bttv.h +++ b/trunk/drivers/media/video/bttv.h @@ -161,6 +161,7 @@ #define BTTV_BOARD_PV_BT878P_2E 0x8a #define BTTV_BOARD_PV_M4900 0x8b #define BTTV_BOARD_OSPREY440 0x8c +#define BTTV_BOARD_ASOUND_SKYEYE 0x8d /* i2c address list */ #define I2C_TSA5522 0xc2