summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornshmyrev@yandex.ru <nshmyrev@yandex.ru>2005-11-08 21:37:38 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:19 -0800
commit71633c05724d85f1afb87629bb96fdf2ef18b41f (patch)
tree87161ddf167b8f04be4d3de0650a2a9ae2157af0
parent16f2e6229f6f7b89cb42f4942cb46dc645faae2a (diff)
downloadblackbird-op-linux-71633c05724d85f1afb87629bb96fdf2ef18b41f.tar.gz
blackbird-op-linux-71633c05724d85f1afb87629bb96fdf2ef18b41f.zip
[PATCH] v4l: 794: added asound skyeye bttv card
- Added Asound Skyeye bttv card. Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/video4linux/CARDLIST.bttv1
-rw-r--r--drivers/media/video/bttv-cards.c17
-rw-r--r--drivers/media/video/bttv.h1
3 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index ba98ff4a79af..2404099996ac 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/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/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 2b19de386dcf..8544a8fa2a5c 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/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/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index ffece3b91360..26cd117a6df4 100644
--- a/drivers/media/video/bttv.h
+++ b/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
OpenPOWER on IntegriCloud