diff options
| author | Gerd Knorr <devnull@localhost> | 2005-02-09 15:42:46 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-02-09 15:42:46 +0000 |
| commit | d88c7c9e5a9181439bd0facde6802a881acd5442 (patch) | |
| tree | 3e999d3831b6572297f10d83be93a564bc306a8c /linux/drivers/media/video/saa7134 | |
| parent | daadf7ba2bb54985678fe7f8270cf18e34f6e9f0 (diff) | |
| download | mediapointer-dvb-s2-d88c7c9e5a9181439bd0facde6802a881acd5442.tar.gz mediapointer-dvb-s2-d88c7c9e5a9181439bd0facde6802a881acd5442.tar.bz2 | |
- split tuner module into multiple smaller files.
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 36 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 37 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index b03605900..702827f30 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,6 +1,6 @@ /* - * $Id: saa7134-cards.c,v 1.49 2005/02/03 11:50:39 kraxel Exp $ + * $Id: saa7134-cards.c,v 1.50 2005/02/09 15:42:46 kraxel Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -545,6 +545,34 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, + [SAA7135_BOARD_ASUSTeK_TVFM7135] = { + .name = "ASUS TV-FM 7135", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_TDA8290, + .gpiomask = 0x200000, + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .gpio = 0x0000, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 4, + .amux = LINE2, + .gpio = 0x0000, + },{ + .name = name_svideo, + .vmux = 6, + .amux = LINE2, + .gpio = 0x0000, + }}, + .radio = { + .name = name_radio, + .amux = TV, + .gpio = 0x200000, + }, + }, [SAA7134_BOARD_VA1000POWER] = { .name = "AOPEN VA1000 POWER", .audio_clock = 0x00187de7, @@ -1551,6 +1579,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .driver_data = SAA7134_BOARD_ASUSTeK_TVFM7134, },{ .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = PCI_VENDOR_ID_ASUSTEK, + .subdevice = 0x4845, + .driver_data = SAA7135_BOARD_ASUSTeK_TVFM7135, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = PCI_VENDOR_ID_ASUSTEK, .subdevice = 0x4830, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 50b51ffa3..1380acc84 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.35 2005/01/13 17:22:33 kraxel Exp $ + * $Id: saa7134.h,v 1.36 2005/02/09 15:42:46 kraxel Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -194,6 +194,7 @@ struct saa7134_format { #define SAA7134_BOARD_PINNACLE_300I_DVBT_PAL 50 #define SAA7134_BOARD_PROVIDEO_PV952 51 #define SAA7134_BOARD_AVERMEDIA_305 52 +#define SAA7135_BOARD_ASUSTeK_TVFM7135 53 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 |