diff options
author | Andy Walls <awalls@radix.net> | 2009-11-20 22:08:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:55 -0500 |
commit | 23bff27aaf81f58a042ee2c9c58c1881635703c3 (patch) | |
tree | 60e0aeee1807437173e34ebdf4fa9679d4c81af8 | |
parent | 9018f6c3a22ef2d7413da17813312d781163d950 (diff) |
V4L/DVB (13440): ivtv: Update the cards definitions to add another AVerMedia M113 variant
Add an AVerMedia M113 variant that was...
Reported-by: Hiemanshu Sharma <hiemanshu@fedoraproject.org>
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/ivtv/ivtv-cards.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c index 4873b6ca5801..ec7883723d18 100644 --- a/drivers/media/video/ivtv/ivtv-cards.c +++ b/drivers/media/video/ivtv/ivtv-cards.c | |||
@@ -1025,13 +1025,15 @@ static const struct ivtv_card ivtv_card_aver_pvr150 = { | |||
1025 | /* AVerMedia UltraTV 1500 MCE (newer non-cx88 version, M113 variant) card */ | 1025 | /* AVerMedia UltraTV 1500 MCE (newer non-cx88 version, M113 variant) card */ |
1026 | 1026 | ||
1027 | static const struct ivtv_card_pci_info ivtv_pci_aver_ultra1500mce[] = { | 1027 | static const struct ivtv_card_pci_info ivtv_pci_aver_ultra1500mce[] = { |
1028 | { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc019 }, | 1028 | { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc019 }, /* NTSC */ |
1029 | { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc01b }, /* PAL/SECAM */ | ||
1029 | { 0, 0, 0 } | 1030 | { 0, 0, 0 } |
1030 | }; | 1031 | }; |
1031 | 1032 | ||
1032 | static const struct ivtv_card ivtv_card_aver_ultra1500mce = { | 1033 | static const struct ivtv_card ivtv_card_aver_ultra1500mce = { |
1033 | .type = IVTV_CARD_AVER_ULTRA1500MCE, | 1034 | .type = IVTV_CARD_AVER_ULTRA1500MCE, |
1034 | .name = "AVerMedia UltraTV 1500 MCE / AVerTV M113 Philips Tuner", | 1035 | .name = "AVerMedia UltraTV 1500 MCE / AVerTV M113 Philips Tuner", |
1036 | .comment = "For non-NTSC tuners, use the pal= or secam= module options", | ||
1035 | .v4l2_capabilities = IVTV_CAP_ENCODER, | 1037 | .v4l2_capabilities = IVTV_CAP_ENCODER, |
1036 | .hw_video = IVTV_HW_CX25840, | 1038 | .hw_video = IVTV_HW_CX25840, |
1037 | .hw_audio = IVTV_HW_CX25840, | 1039 | .hw_audio = IVTV_HW_CX25840, |
@@ -1058,6 +1060,7 @@ static const struct ivtv_card ivtv_card_aver_ultra1500mce = { | |||
1058 | .tuners = { | 1060 | .tuners = { |
1059 | /* The UltraTV 1500 MCE has a Philips FM1236 MK5 TV/FM tuner */ | 1061 | /* The UltraTV 1500 MCE has a Philips FM1236 MK5 TV/FM tuner */ |
1060 | { .std = V4L2_STD_MN, .tuner = TUNER_PHILIPS_FM1236_MK3 }, | 1062 | { .std = V4L2_STD_MN, .tuner = TUNER_PHILIPS_FM1236_MK3 }, |
1063 | { .std = V4L2_STD_PAL_SECAM, .tuner = TUNER_PHILIPS_FM1216MK5 }, | ||
1061 | }, | 1064 | }, |
1062 | .pci_list = ivtv_pci_aver_ultra1500mce, | 1065 | .pci_list = ivtv_pci_aver_ultra1500mce, |
1063 | .i2c = &ivtv_i2c_std, | 1066 | .i2c = &ivtv_i2c_std, |