aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttv-cards.c
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l\@cerqueira.org>2005-11-08 21:36:20 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:07 -0800
commitcc9d8d49bb13fdcea521f907e120d3a7c7ce94f8 (patch)
tree6e032140664ea6822675749963ad2ea743d27ccf /drivers/media/video/bttv-cards.c
parent[PATCH] v4l: 634: implemented tuner set standby on cx88 init (diff)
downloadlinux-dev-cc9d8d49bb13fdcea521f907e120d3a7c7ce94f8.tar.xz
linux-dev-cc9d8d49bb13fdcea521f907e120d3a7c7ce94f8.zip
[PATCH] v4l: 635: add bttv card 137 conceptronic ctvfmi v2
- Add bttv card 137 - Conceptronic CTVFMi v2 Signed-off-by: Ricardo Cerqueira <v4l\@cerqueira.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net> 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>
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
-rw-r--r--drivers/media/video/bttv-cards.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 0881a17d5226..75033f06551f 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2418,6 +2418,21 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_YMEC_TVF66T5_B_DFF,
.tuner_addr = 0xc1 >>1,
.has_radio = 1,
+},{
+ /* ---- card 0x89 ---------------------------------- */
+ .name = "Conceptronic CTVFMi v2",
+ .video_inputs = 3,
+ .audio_inputs = 1,
+ .tuner = 0,
+ .svhs = 2,
+ .gpiomask = 0x001c0007,
+ .muxsel = { 2, 3, 1, 1 },
+ .audiomux = { 0, 1, 2, 2, 3 },
+ .needs_tvaudio = 0,
+ .pll = PLL_28,
+ .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
+ .tuner_addr = ADDR_UNSET,
+ .has_remote = 1,
}};
static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);