diff options
author | Mauro Lacy <mauro@lacy.com.ar> | 2008-04-22 13:45:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:51 -0400 |
commit | e80faad3d7a332b7fe5a72dd64a81d28dd5c2e44 (patch) | |
tree | 37743b7e823cbfedf2d37d9355ed6caaa8df5c25 /drivers/media/video/bt8xx | |
parent | 97275ac514c7f1131f42f8b06e073b144c744e78 (diff) |
V4L/DVB (7368): bttv: added support for Kozumi KTV-01C card
Signed-off-by: Mauro Lacy <mauro@lacy.com.ar>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 23 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 6 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 417dd552dba9..22c2708e42ab 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -3015,6 +3015,29 @@ struct tvcard bttv_tvcards[] = { | |||
3015 | .tuner_addr = ADDR_UNSET, | 3015 | .tuner_addr = ADDR_UNSET, |
3016 | .radio_addr = ADDR_UNSET, | 3016 | .radio_addr = ADDR_UNSET, |
3017 | }, | 3017 | }, |
3018 | [BTTV_BOARD_KOZUMI_KTV_01C] = { | ||
3019 | /* Mauro Lacy <mauro@lacy.com.ar> | ||
3020 | * Based on MagicTV and Conceptronic CONTVFMi */ | ||
3021 | |||
3022 | .name = "Kozumi KTV-01C", | ||
3023 | .video_inputs = 3, | ||
3024 | .audio_inputs = 1, | ||
3025 | .tuner = 0, | ||
3026 | .svhs = 2, | ||
3027 | .gpiomask = 0x008007, | ||
3028 | .muxsel = { 2, 3, 1, 1 }, | ||
3029 | .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */ | ||
3030 | /*gpiomux = { 0, 1, 2, 3 }, /* MagicTV */ | ||
3031 | .gpiomute = 3, /* CONTVFMi */ | ||
3032 | /*gpiomute = 4, /* MagicTV */ | ||
3033 | .needs_tvaudio = 0, | ||
3034 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */ | ||
3035 | .tuner_addr = ADDR_UNSET, | ||
3036 | .radio_addr = ADDR_UNSET, | ||
3037 | .pll = PLL_28, | ||
3038 | .has_radio = 1, | ||
3039 | .has_remote = 1, | ||
3040 | }, | ||
3018 | }; | 3041 | }; |
3019 | 3042 | ||
3020 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); | 3043 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index fc9ecb21eec6..a38af98f4cae 100644 --- a/drivers/media/video/bt8xx/bttv-input.c +++ b/drivers/media/video/bt8xx/bttv-input.c | |||
@@ -278,6 +278,12 @@ int bttv_input_init(struct bttv *btv) | |||
278 | ir->mask_keyup = 0x004000; | 278 | ir->mask_keyup = 0x004000; |
279 | ir->polling = 50; /* ms */ | 279 | ir->polling = 50; /* ms */ |
280 | break; | 280 | break; |
281 | case BTTV_BOARD_KOZUMI_KTV_01C: | ||
282 | ir_codes = ir_codes_pctv_sedna; | ||
283 | ir->mask_keycode = 0x001f00; | ||
284 | ir->mask_keyup = 0x006000; | ||
285 | ir->polling = 50; /* ms */ | ||
286 | break; | ||
281 | } | 287 | } |
282 | if (NULL == ir_codes) { | 288 | if (NULL == ir_codes) { |
283 | dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); | 289 | dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index ed0cd3b1a01e..0c859d949c78 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -174,6 +174,7 @@ | |||
174 | #define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94 | 174 | #define BTTV_BOARD_DVICO_FUSIONHDTV_2 0x94 |
175 | #define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95 | 175 | #define BTTV_BOARD_TYPHOON_TVTUNERPCI 0x95 |
176 | #define BTTV_BOARD_GEOVISION_GV600 0x96 | 176 | #define BTTV_BOARD_GEOVISION_GV600 0x96 |
177 | #define BTTV_BOARD_KOZUMI_KTV_01C 0x97 | ||
177 | 178 | ||
178 | 179 | ||
179 | /* more card-specific defines */ | 180 | /* more card-specific defines */ |