aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorTony Wan <wankai@sjtu.org>2007-05-10 11:16:47 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:23:20 -0400
commitaaccb82bdb93889987497b2b712c5160cdf79240 (patch)
treeba730beb70bb156847faf0cb4f001235fbfe84bb /drivers/media/video/saa7134/saa7134-cards.c
parentc5f48367fe54c46805774eeea8e828de54a5ad7b (diff)
V4L/DVB (5646): V4l: saa7134: add support for 10moons TM300 card
Support the 10moons TM300 TV card (so called TV Master 3), which is a 10moons saa7130 based board. Here not include features for the IR-remote. It has been tested using TVTIME. The card was auto-detected and all the input sources worked correct with sound. Signed-off-by: Tony Wan <wankai@sjtu.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> 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.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 50f15adfa7c8..44f207780a49 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3502,6 +3502,38 @@ struct saa7134_board saa7134_boards[] = {
3502 .amux = TV, 3502 .amux = TV,
3503 }, 3503 },
3504 }, 3504 },
3505 [SAA7134_BOARD_10MOONSTVMASTER3] = {
3506 /* Tony Wan <aloha_cn@hotmail.com> */
3507 .name = "10MOONS TM300 TV Card",
3508 .audio_clock = 0x00200000,
3509 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
3510 .radio_type = UNSET,
3511 .tuner_addr = ADDR_UNSET,
3512 .radio_addr = ADDR_UNSET,
3513 .gpiomask = 0x7000,
3514 .inputs = {{
3515 .name = name_tv,
3516 .vmux = 1,
3517 .amux = LINE2,
3518 .gpio = 0x0000,
3519 .tv = 1,
3520 },{
3521 .name = name_comp1,
3522 .vmux = 3,
3523 .amux = LINE1,
3524 .gpio = 0x2000,
3525 },{
3526 .name = name_svideo,
3527 .vmux = 8,
3528 .amux = LINE1,
3529 .gpio = 0x2000,
3530 }},
3531 .mute = {
3532 .name = name_mute,
3533 .amux = LINE2,
3534 .gpio = 0x3000,
3535 },
3536 },
3505}; 3537};
3506 3538
3507const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 3539const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4219,6 +4251,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4219 .subdevice = 0x2003, /* OEM cardbus */ 4251 .subdevice = 0x2003, /* OEM cardbus */
4220 .driver_data = SAA7134_BOARD_SABRENT_TV_PCB05, 4252 .driver_data = SAA7134_BOARD_SABRENT_TV_PCB05,
4221 },{ 4253 },{
4254 .vendor = PCI_VENDOR_ID_PHILIPS,
4255 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
4256 .subvendor = PCI_VENDOR_ID_PHILIPS,
4257 .subdevice = 0x2304,
4258 .driver_data = SAA7134_BOARD_10MOONSTVMASTER3,
4259 },{
4222 /* --- boards without eeprom + subsystem ID --- */ 4260 /* --- boards without eeprom + subsystem ID --- */
4223 .vendor = PCI_VENDOR_ID_PHILIPS, 4261 .vendor = PCI_VENDOR_ID_PHILIPS,
4224 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 4262 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,