aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c9
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c12
3 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 8be8f9738cde..a9bffd9a3d80 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -76,7 +76,7 @@
76 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044]
77 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 76 -> SKNet MonsterTV Mobile [1131:4ee9]
78 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] 78 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e]
79 78 -> ASUSTeK P7131 Dual [1043:4862] 79 78 -> ASUSTeK P7131 Dual [1043:4862,1043:4876]
80 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
81 80 -> ASUS Digimatrix TV [1043:0210] 81 80 -> ASUS Digimatrix TV [1043:0210]
82 81 -> Philips Tiger reference design [1131:2018] 82 81 -> Philips Tiger reference design [1131:2018]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 2a00cb40f112..8109c8ef09ff 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2462,14 +2462,17 @@ struct saa7134_board saa7134_boards[] = {
2462 .vmux = 1, 2462 .vmux = 1,
2463 .amux = TV, 2463 .amux = TV,
2464 .tv = 1, 2464 .tv = 1,
2465 .gpio = 0x0000000,
2465 },{ 2466 },{
2466 .name = name_comp1, 2467 .name = name_comp1,
2467 .vmux = 3, 2468 .vmux = 3,
2468 .amux = LINE2, 2469 .amux = LINE2,
2470 .gpio = 0x0200000,
2469 },{ 2471 },{
2470 .name = name_svideo, 2472 .name = name_svideo,
2471 .vmux = 8, 2473 .vmux = 8,
2472 .amux = LINE2, 2474 .amux = LINE2,
2475 .gpio = 0x0200000,
2473 }}, 2476 }},
2474 .radio = { 2477 .radio = {
2475 .name = name_radio, 2478 .name = name_radio,
@@ -3719,6 +3722,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3719 .subdevice = 0x9715, 3722 .subdevice = 0x9715,
3720 .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507, 3723 .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507,
3721 },{ 3724 },{
3725 .vendor = PCI_VENDOR_ID_PHILIPS,
3726 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3727 .subvendor = 0x1043,
3728 .subdevice = 0x4876,
3729 .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
3730 },{
3722 /* --- boards without eeprom + subsystem ID --- */ 3731 /* --- boards without eeprom + subsystem ID --- */
3723 .vendor = PCI_VENDOR_ID_PHILIPS, 3732 .vendor = PCI_VENDOR_ID_PHILIPS,
3724 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 3733 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 69092f092bb8..706450c27a57 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -894,6 +894,16 @@ static struct tda1004x_config pinnacle_pctv_310i_config = {
894 894
895/* ------------------------------------------------------------------ */ 895/* ------------------------------------------------------------------ */
896 896
897static struct tda1004x_config asus_p7131_dual_config = {
898 .demod_address = 0x08,
899 .invert = 1,
900 .invert_oclk = 0,
901 .xtal_freq = TDA10046_XTAL_16M,
902 .agc_config = TDA10046_AGC_TDA827X,
903 .if_freq = TDA10046_FREQ_045,
904 .request_firmware = philips_tda1004x_request_firmware,
905};
906
897static int asus_p7131_dual_tuner_init(struct dvb_frontend *fe) 907static int asus_p7131_dual_tuner_init(struct dvb_frontend *fe)
898{ 908{
899 struct saa7134_dev *dev = fe->dvb->priv; 909 struct saa7134_dev *dev = fe->dvb->priv;
@@ -1207,7 +1217,7 @@ static int dvb_init(struct saa7134_dev *dev)
1207 break; 1217 break;
1208 case SAA7134_BOARD_ASUSTeK_P7131_DUAL: 1218 case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
1209 dev->dvb.frontend = dvb_attach(tda10046_attach, 1219 dev->dvb.frontend = dvb_attach(tda10046_attach,
1210 &philips_tiger_config, 1220 &asus_p7131_dual_config,
1211 &dev->i2c_adap); 1221 &dev->i2c_adap);
1212 if (dev->dvb.frontend) { 1222 if (dev->dvb.frontend) {
1213 dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl; 1223 dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;