diff options
author | Markus Rechberger <mrechberger@gmail.com> | 2007-04-27 11:31:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 14:43:44 -0400 |
commit | e95d317da2de7116ef66fa16bd9664cd39f1c11c (patch) | |
tree | f2b58b23953e85a9ed355474742d0c3111c7e716 /drivers/media/video/saa7134/saa7134-cards.c | |
parent | 9040b32ea34eff58c59b46abf440c0dd1614c8a2 (diff) |
V4L/DVB (5330): Added card definition for AverMedia M102 miniPCI
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 87a8a68efc5c..23cd5f6bed17 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -3328,6 +3328,29 @@ struct saa7134_board saa7134_boards[] = { | |||
3328 | .gpio = 0x0200000, | 3328 | .gpio = 0x0200000, |
3329 | }, | 3329 | }, |
3330 | }, | 3330 | }, |
3331 | [SAA7134_BOARD_AVERMEDIA_M102] = { | ||
3332 | .name = "Avermedia M102", | ||
3333 | .audio_clock = 0x00187de7, | ||
3334 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
3335 | .radio_type = UNSET, | ||
3336 | .tuner_addr = ADDR_UNSET, | ||
3337 | .radio_addr = ADDR_UNSET, | ||
3338 | .gpiomask = 1<<21, | ||
3339 | .inputs = {{ | ||
3340 | .name = name_tv, | ||
3341 | .vmux = 1, | ||
3342 | .amux = TV, | ||
3343 | .tv = 1, | ||
3344 | },{ | ||
3345 | .name = name_comp1, | ||
3346 | .vmux = 0, | ||
3347 | .amux = LINE2, | ||
3348 | },{ | ||
3349 | .name = name_svideo, | ||
3350 | .vmux = 6, | ||
3351 | .amux = LINE2, | ||
3352 | }}, | ||
3353 | }, | ||
3331 | }; | 3354 | }; |
3332 | 3355 | ||
3333 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 3356 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -3997,6 +4020,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
3997 | .subdevice = 0x1175, | 4020 | .subdevice = 0x1175, |
3998 | .driver_data = SAA7134_BOARD_CINERGY_HT_PCI, | 4021 | .driver_data = SAA7134_BOARD_CINERGY_HT_PCI, |
3999 | },{ | 4022 | },{ |
4023 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4024 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4025 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
4026 | .subdevice = 0xf31e, | ||
4027 | .driver_data = SAA7134_BOARD_AVERMEDIA_M102, | ||
4028 | },{ | ||
4000 | /* --- boards without eeprom + subsystem ID --- */ | 4029 | /* --- boards without eeprom + subsystem ID --- */ |
4001 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4030 | .vendor = PCI_VENDOR_ID_PHILIPS, |
4002 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 4031 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -4010,7 +4039,6 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
4010 | .subdevice = 0, | 4039 | .subdevice = 0, |
4011 | .driver_data = SAA7134_BOARD_NOAUTO, | 4040 | .driver_data = SAA7134_BOARD_NOAUTO, |
4012 | },{ | 4041 | },{ |
4013 | |||
4014 | /* --- default catch --- */ | 4042 | /* --- default catch --- */ |
4015 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4043 | .vendor = PCI_VENDOR_ID_PHILIPS, |
4016 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 4044 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
@@ -4176,6 +4204,11 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
4176 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", | 4204 | "%s: Dual decoder functionality is disabled for now, use the other chip.\n", |
4177 | dev->name,card(dev).name,dev->name,dev->name); | 4205 | dev->name,card(dev).name,dev->name,dev->name); |
4178 | break; | 4206 | break; |
4207 | case SAA7134_BOARD_AVERMEDIA_M102: | ||
4208 | /* enable tuner */ | ||
4209 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x8c040007, 0x8c040007); | ||
4210 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0c0007cd, 0x0c0007cd); | ||
4211 | break; | ||
4179 | } | 4212 | } |
4180 | return 0; | 4213 | return 0; |
4181 | } | 4214 | } |