aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-12-07 18:40:16 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:03:23 -0500
commite08323f099b5aba28610a856fa7d21d0d86fd4f0 (patch)
tree1679df340feb18880633bfdea09c47b7c78372bf /drivers/media/video/ivtv
parent0170a48274acbed20b3b8d1f4a6cecd08ae5015e (diff)
V4L/DVB (6763): ivtv: add AVerMedia EZMaker PCI Deluxe support
Add support for the AVerMedia EZMaker PCI Deluxe and update the ivtv cardlist. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-cards.c29
-rw-r--r--drivers/media/video/ivtv/ivtv-cards.h3
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c1
3 files changed, 32 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c
index 4bb2fe8bce0b..715285e60089 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -956,6 +956,34 @@ static const struct ivtv_card ivtv_card_aver_pvr150 = {
956 956
957/* ------------------------------------------------------------------------- */ 957/* ------------------------------------------------------------------------- */
958 958
959/* AVerMedia EZMaker PCI Deluxe card */
960
961static const struct ivtv_card_pci_info ivtv_pci_aver_ezmaker[] = {
962 { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc03f },
963 { 0, 0, 0 }
964};
965
966static const struct ivtv_card ivtv_card_aver_ezmaker = {
967 .type = IVTV_CARD_AVER_EZMAKER,
968 .name = "AVerMedia EZMaker PCI Deluxe",
969 .v4l2_capabilities = IVTV_CAP_ENCODER,
970 .hw_video = IVTV_HW_CX25840,
971 .hw_audio = IVTV_HW_CX25840,
972 .hw_audio_ctrl = IVTV_HW_CX25840,
973 .hw_all = IVTV_HW_CX25840 | IVTV_HW_WM8739,
974 .video_inputs = {
975 { IVTV_CARD_INPUT_SVIDEO1, 0, CX25840_SVIDEO3 },
976 { IVTV_CARD_INPUT_COMPOSITE1, 0, CX25840_COMPOSITE1 },
977 },
978 .audio_inputs = {
979 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL, 0 },
980 },
981 .gpio_init = { .direction = 0x4000, .initial_value = 0x4000 },
982 .pci_list = ivtv_pci_aver_ezmaker,
983};
984
985/* ------------------------------------------------------------------------- */
986
959/* ASUS Falcon2 */ 987/* ASUS Falcon2 */
960 988
961static const struct ivtv_card_pci_info ivtv_pci_asus_falcon2[] = { 989static const struct ivtv_card_pci_info ivtv_pci_asus_falcon2[] = {
@@ -1016,6 +1044,7 @@ static const struct ivtv_card *ivtv_card_list[] = {
1016 &ivtv_card_avertv_mce116, 1044 &ivtv_card_avertv_mce116,
1017 &ivtv_card_asus_falcon2, 1045 &ivtv_card_asus_falcon2,
1018 &ivtv_card_aver_pvr150, 1046 &ivtv_card_aver_pvr150,
1047 &ivtv_card_aver_ezmaker,
1019 1048
1020 /* Variations of standard cards but with the same PCI IDs. 1049 /* Variations of standard cards but with the same PCI IDs.
1021 These cards must come last in this list. */ 1050 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 881b04473163..b982fb06c584 100644
--- a/drivers/media/video/ivtv/ivtv-cards.h
+++ b/drivers/media/video/ivtv/ivtv-cards.h
@@ -47,7 +47,8 @@
47#define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */ 47#define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */
48#define IVTV_CARD_ASUS_FALCON2 21 /* ASUS Falcon2 */ 48#define IVTV_CARD_ASUS_FALCON2 21 /* ASUS Falcon2 */
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_LAST 22 50#define IVTV_CARD_AVER_EZMAKER 23 /* AVerMedia EZMaker PCI Deluxe */
51#define IVTV_CARD_LAST 23
51 52
52/* Variants of existing cards but with the same PCI IDs. The driver 53/* Variants of existing cards but with the same PCI IDs. The driver
53 detects these based on other device information. 54 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 7c600d0f48cd..4595c7807f2c 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -187,6 +187,7 @@ MODULE_PARM_DESC(cardtype,
187 "\t\t\t21 = AverTV MCE 116 Plus\n" 187 "\t\t\t21 = AverTV MCE 116 Plus\n"
188 "\t\t\t22 = ASUS Falcon2\n" 188 "\t\t\t22 = ASUS Falcon2\n"
189 "\t\t\t23 = AverMedia PVR-150 Plus\n" 189 "\t\t\t23 = AverMedia PVR-150 Plus\n"
190 "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n"
190 "\t\t\t 0 = Autodetect (default)\n" 191 "\t\t\t 0 = Autodetect (default)\n"
191 "\t\t\t-1 = Ignore this card\n\t\t"); 192 "\t\t\t-1 = Ignore this card\n\t\t");
192MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); 193MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");