diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-20 05:19:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:06:42 -0400 |
commit | d56eebfbdc11d1a3809d8bd793a118da5058ffa8 (patch) | |
tree | 4719a5e6572109d001c304e56001030b93e83251 /drivers/media | |
parent | b4ac3c8d8de387366be11c7320693e0b14429a49 (diff) |
V4L/DVB (7926): ivtv: add support for the Buffalo PC-MV5L/PCI card.
Thanks to Peter Brandt for doing the necessary tests to fill out the card
definition!
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-cards.c | 37 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-cards.h | 3 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c index 4fb8faefe2ce..ba2b0cf4531b 100644 --- a/drivers/media/video/ivtv/ivtv-cards.c +++ b/drivers/media/video/ivtv/ivtv-cards.c | |||
@@ -1111,6 +1111,42 @@ static const struct ivtv_card ivtv_card_aver_m104 = { | |||
1111 | .i2c = &ivtv_i2c_std, | 1111 | .i2c = &ivtv_i2c_std, |
1112 | }; | 1112 | }; |
1113 | 1113 | ||
1114 | /* ------------------------------------------------------------------------- */ | ||
1115 | |||
1116 | /* Buffalo PC-MV5L/PCI cards */ | ||
1117 | |||
1118 | static const struct ivtv_card_pci_info ivtv_pci_buffalo[] = { | ||
1119 | { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_MELCO, 0x052b }, | ||
1120 | { 0, 0, 0 } | ||
1121 | }; | ||
1122 | |||
1123 | static const struct ivtv_card ivtv_card_buffalo = { | ||
1124 | .type = IVTV_CARD_BUFFALO_MV5L, | ||
1125 | .name = "Buffalo PC-MV5L/PCI", | ||
1126 | .v4l2_capabilities = IVTV_CAP_ENCODER, | ||
1127 | .hw_video = IVTV_HW_CX25840, | ||
1128 | .hw_audio = IVTV_HW_CX25840, | ||
1129 | .hw_audio_ctrl = IVTV_HW_CX25840, | ||
1130 | .hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER, | ||
1131 | .video_inputs = { | ||
1132 | { IVTV_CARD_INPUT_VID_TUNER, 0, CX25840_COMPOSITE2 }, | ||
1133 | { IVTV_CARD_INPUT_SVIDEO1, 1, | ||
1134 | CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 }, | ||
1135 | { IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 }, | ||
1136 | }, | ||
1137 | .audio_inputs = { | ||
1138 | { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 }, | ||
1139 | { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL }, | ||
1140 | }, | ||
1141 | .gpio_init = { .direction = 0x1000, .initial_value = 0x1000 }, | ||
1142 | .xceive_pin = 12, | ||
1143 | .tuners = { | ||
1144 | { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, | ||
1145 | }, | ||
1146 | .pci_list = ivtv_pci_buffalo, | ||
1147 | .i2c = &ivtv_i2c_std, | ||
1148 | }; | ||
1149 | |||
1114 | static const struct ivtv_card *ivtv_card_list[] = { | 1150 | static const struct ivtv_card *ivtv_card_list[] = { |
1115 | &ivtv_card_pvr250, | 1151 | &ivtv_card_pvr250, |
1116 | &ivtv_card_pvr350, | 1152 | &ivtv_card_pvr350, |
@@ -1137,6 +1173,7 @@ static const struct ivtv_card *ivtv_card_list[] = { | |||
1137 | &ivtv_card_aver_pvr150, | 1173 | &ivtv_card_aver_pvr150, |
1138 | &ivtv_card_aver_ezmaker, | 1174 | &ivtv_card_aver_ezmaker, |
1139 | &ivtv_card_aver_m104, | 1175 | &ivtv_card_aver_m104, |
1176 | &ivtv_card_buffalo, | ||
1140 | 1177 | ||
1141 | /* Variations of standard cards but with the same PCI IDs. | 1178 | /* Variations of standard cards but with the same PCI IDs. |
1142 | These cards must come last in this list. */ | 1179 | These cards must come last in this list. */ |
diff --git a/drivers/media/video/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h index 748485dcebbd..381af1bceef8 100644 --- a/drivers/media/video/ivtv/ivtv-cards.h +++ b/drivers/media/video/ivtv/ivtv-cards.h | |||
@@ -49,7 +49,8 @@ | |||
49 | #define IVTV_CARD_AVER_PVR150PLUS 22 /* AVerMedia PVR-150 Plus */ | 49 | #define IVTV_CARD_AVER_PVR150PLUS 22 /* AVerMedia PVR-150 Plus */ |
50 | #define IVTV_CARD_AVER_EZMAKER 23 /* AVerMedia EZMaker PCI Deluxe */ | 50 | #define IVTV_CARD_AVER_EZMAKER 23 /* AVerMedia EZMaker PCI Deluxe */ |
51 | #define IVTV_CARD_AVER_M104 24 /* AverMedia M104 miniPCI card */ | 51 | #define IVTV_CARD_AVER_M104 24 /* AverMedia M104 miniPCI card */ |
52 | #define IVTV_CARD_LAST 24 | 52 | #define IVTV_CARD_BUFFALO_MV5L 25 /* Buffalo PC-MV5L/PCI card */ |
53 | #define IVTV_CARD_LAST 25 | ||
53 | 54 | ||
54 | /* Variants of existing cards but with the same PCI IDs. The driver | 55 | /* Variants of existing cards but with the same PCI IDs. The driver |
55 | detects these based on other device information. | 56 | detects these based on other device information. |
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index bbe92d9dce36..323dd68fa1c6 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -191,6 +191,7 @@ MODULE_PARM_DESC(cardtype, | |||
191 | "\t\t\t23 = AverMedia PVR-150 Plus\n" | 191 | "\t\t\t23 = AverMedia PVR-150 Plus\n" |
192 | "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n" | 192 | "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n" |
193 | "\t\t\t25 = AverMedia M104 (not yet working)\n" | 193 | "\t\t\t25 = AverMedia M104 (not yet working)\n" |
194 | "\t\t\t26 = Buffalo PC-MV5L/PCI\n" | ||
194 | "\t\t\t 0 = Autodetect (default)\n" | 195 | "\t\t\t 0 = Autodetect (default)\n" |
195 | "\t\t\t-1 = Ignore this card\n\t\t"); | 196 | "\t\t\t-1 = Ignore this card\n\t\t"); |
196 | MODULE_PARM_DESC(pal, "Set PAL standard: BGH, DK, I, M, N, Nc, 60"); | 197 | MODULE_PARM_DESC(pal, "Set PAL standard: BGH, DK, I, M, N, Nc, 60"); |