aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorHermann Pitton <hermann.pitton@onlinehome.de>2005-11-09 00:38:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:23 -0500
commit28f0224170c4d8115383f56985575a42ed8b4dc1 (patch)
treedabe814416e91fe7b0523d65d44dabb94061b07f /drivers/media/video/saa7134
parent67678360c8b8b15b05d730eb8f1b02411891417f (diff)
[PATCH] v4l: 833: analog support for asus p7131 dual tda8275a
- Analog support for Asus P7131 Dual - TDA8275A Signed-off-by: Hermann Pitton <hermann.pitton@onlinehome.de> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c34
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
2 files changed, 35 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 0147d8342f8d..155a66b3a2d2 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2418,6 +2418,34 @@ struct saa7134_board saa7134_boards[] = {
2418 .amux = LINE1, 2418 .amux = LINE1,
2419 }, 2419 },
2420 }, 2420 },
2421 [SAA7134_BOARD_ASUSTeK_P7131_DUAL] = {
2422 .name = "ASUSTeK P7131 Dual",
2423 .audio_clock = 0x00187de7,
2424 .tuner_type = TUNER_PHILIPS_TDA8290,
2425 .radio_type = UNSET,
2426 .tuner_addr = ADDR_UNSET,
2427 .radio_addr = ADDR_UNSET,
2428 .gpiomask = 1 << 21,
2429 .inputs = {{
2430 .name = name_tv,
2431 .vmux = 1,
2432 .amux = TV,
2433 .tv = 1,
2434 },{
2435 .name = name_comp1,
2436 .vmux = 3,
2437 .amux = LINE2,
2438 },{
2439 .name = name_svideo,
2440 .vmux = 8,
2441 .amux = LINE2,
2442 }},
2443 .radio = {
2444 .name = name_radio,
2445 .amux = TV,
2446 .gpio = 0x0200000,
2447 },
2448 },
2421}; 2449};
2422 2450
2423const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 2451const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2842,6 +2870,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
2842 .subdevice = 0x002e, 2870 .subdevice = 0x002e,
2843 .driver_data = SAA7134_BOARD_PINNACLE_PCTV_110i, 2871 .driver_data = SAA7134_BOARD_PINNACLE_PCTV_110i,
2844 },{ 2872 },{
2873 .vendor = PCI_VENDOR_ID_PHILIPS,
2874 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2875 .subvendor = 0x1043,
2876 .subdevice = 0x4862,
2877 .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
2878 },{
2845 /* --- boards without eeprom + subsystem ID --- */ 2879 /* --- boards without eeprom + subsystem ID --- */
2846 .vendor = PCI_VENDOR_ID_PHILIPS, 2880 .vendor = PCI_VENDOR_ID_PHILIPS,
2847 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2881 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 99d000be095e..ae89a3368ffe 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -205,6 +205,7 @@ struct saa7134_format {
205#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 205#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75
206#define SAA7134_BOARD_MONSTERTV_MOBILE 76 206#define SAA7134_BOARD_MONSTERTV_MOBILE 76
207#define SAA7134_BOARD_PINNACLE_PCTV_110i 77 207#define SAA7134_BOARD_PINNACLE_PCTV_110i 77
208#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
208 209
209#define SAA7134_MAXBOARDS 8 210#define SAA7134_MAXBOARDS 8
210#define SAA7134_INPUT_MAX 8 211#define SAA7134_INPUT_MAX 8