diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 14:16:10 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-15 14:16:10 +0000 |
| commit | 75bdff379e679479f11fb8c2332ee920b7f23eb9 (patch) | |
| tree | 7e0281ee709131a58208fee2577ee6d9292aadef /linux/drivers | |
| parent | bc36344a0da30992e70dd4327659c2a01b5e5ae8 (diff) | |
| download | mediapointer-dvb-s2-75bdff379e679479f11fb8c2332ee920b7f23eb9.tar.gz mediapointer-dvb-s2-75bdff379e679479f11fb8c2332ee920b7f23eb9.tar.bz2 | |
* ../linux/Documentation/video4linux/CARDLIST.saa7134:
* ../linux/drivers/media/video/saa7134/saa7134-cards.c:
(saa7134_board_init1):
* ../linux/drivers/media/video/saa7134/saa7134.h:
- Add SKNet Monster TV Mobile card.
Signed-off-by: Pieter Palmers <pieterp@joow.be>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 38 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 37 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 8eb325871..7422c493d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.101 2005/10/12 03:16:15 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.102 2005/10/15 14:16:10 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2370,6 +2370,29 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2, }}, }, + [SAA7134_BOARD_MONSTERTV_MOBILE] = { + .name = "SKNet MonsterTV Mobile", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 3, + .amux = LINE1, + },{ + .name = name_svideo, + .vmux = 6, + .amux = LINE1, + }}, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -2775,13 +2798,19 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = 0x1435, .subdevice = 0x7330, .driver_data = SAA7134_BOARD_RTD_VFG7330, - },{ + },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x1461, .subdevice = 0x1044, .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1131, + .subdevice = 0x4ee9, + .driver_data = SAA7134_BOARD_MONSTERTV_MOBILE, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, @@ -2928,7 +2957,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) /* power-up tuner chip */ saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000); saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000); - msleep(1); + case SAA7134_BOARD_MONSTERTV_MOBILE: + /* power-up tuner chip */ + saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000); + saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000004); break; case SAA7134_BOARD_FLYDVBTDUO: case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS: diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 028becb77..a38ef1a83 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.65 2005/10/12 03:16:15 mkrufky Exp $ + * $Id: saa7134.h,v 1.66 2005/10/15 14:16:10 nsh Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -209,6 +209,7 @@ struct saa7134_format { #define SAA7134_BOARD_RTD_VFG7330 73 #define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74 #define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 +#define SAA7134_BOARD_MONSTERTV_MOBILE 76 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 |