diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-20 00:02:54 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-20 00:02:54 +0000 |
| commit | 06596efac380a004e002a1eb4169e93e95563254 (patch) | |
| tree | b886bc9faaded20e0ff3bcd5dfeb1969f394f48e | |
| parent | 71fed0f334b891c1cd3624fcc6739671d2afba4a (diff) | |
| download | mediapointer-dvb-s2-06596efac380a004e002a1eb4169e93e95563254.tar.gz mediapointer-dvb-s2-06596efac380a004e002a1eb4169e93e95563254.tar.bz2 | |
* ../linux/Documentation/video4linux/CARDLIST.saa7134:
* ../linux/drivers/media/video/saa7134/saa7134-cards.c:
* ../linux/drivers/media/video/saa7134/saa7134.h:
- Analog support for Asus P7131 Dual - TDA8275A
- Digital support is under development
- Remote doesn't work yet
Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 39 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
4 files changed, 53 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 9b3ef0031..d476f8e15 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -76,3 +76,4 @@ 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] + 78 -> ASUSTeK P7131 Dual [1043:4862] diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 80a580a3c..28fc8055a 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.104 2005/10/17 22:01:51 nsh Exp $ + * $Id: saa7134-cards.c,v 1.105 2005/10/20 00:02:54 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2420,6 +2420,37 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, + [SAA7134_BOARD_ASUSTeK_P7131_DUAL] = { + .name = "ASUSTeK P7131 Dual", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .gpiomask = 1 << 21, +#if 0 + .mpeg = SAA7134_MPEG_DVB, +#endif + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 3, + .amux = LINE2, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE2, + }}, + .radio = { + .name = name_radio, + .amux = TV, + .gpio = 0x0200000, + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -2844,6 +2875,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x002e, .driver_data = SAA7134_BOARD_PINNACLE_PCTV_110i, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1043, + .subdevice = 0x4862, + .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 1b2dd403f..b7eecdf72 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.70 2005/10/18 14:16:40 mchehab Exp $ + * $Id: saa7134.h,v 1.71 2005/10/20 00:02:54 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -212,6 +212,7 @@ struct saa7134_format { #define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 #define SAA7134_BOARD_MONSTERTV_MOBILE 76 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 +#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2784a9400..94b344071 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-10-20 00:00 mkrufky + + * ../linux/Documentation/video4linux/CARDLIST.saa7134: + * ../linux/drivers/media/video/saa7134/saa7134-cards.c: + * ../linux/drivers/media/video/saa7134/saa7134.h: + - Analog support for Asus P7131 Dual - TDA8275A + - Digital support is under development + - Remote doesn't work yet + + Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-19 20:05 mchehab * ../v4l/scripts/gentree.pl: |