V4L/DVB (9113): saa7134: fixes for the Asus Tiger Revision 1.00

In opposite to the P7131 Dual this early OEM card has a male radio antenna connector and also no remote. We currently switch the DVB-T RF feed to the radio input, like on the P7131 with female radio connector used also for DVB-T and should improve this. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

V4L/DVB (9113): saa7134: fixes for the Asus Tiger Revision 1.00
In opposite to the P7131 Dual this early OEM card has a male radio antenna connector and also no remote. We currently switch the DVB-T RF feed to the radio input, like on the P7131 with female radio connector used also for DVB-T and should improve this. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Hermann Pitton · Mauro Carvalho Chehab
1 parent 1e758265f4
Showing 4 changed files with 48 additions and 6 deletions Side-by-side Diff
Documentation/video4linux/CARDLIST.saa7134
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-dvb.c
drivers/media/video/saa7134/saa7134.h
@@ -76,7 +76,7 @@
  75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]
  76 -> SKNet MonsterTV Mobile                   [1131:4ee9]
  77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]
- 78 -> ASUSTeK P7131 Dual                       [1043:4862,1043:4857]
+ 78 -> ASUSTeK P7131 Dual                       [1043:4862]
  79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
  80 -> ASUS Digimatrix TV                       [1043:0210]
  81 -> Philips Tiger reference design           [1131:2018]
@@ -150,4 +150,5 @@
 149 -> Avermedia PCI pure analog (M135A)        [1461:f11d]
 150 -> Zogis Real Angel 220
 151 -> ADS Tech Instant HDTV                    [1421:0380]
+152 -> Asus Tiger Rev:1.00                      [1043:4857]
@@ -4527,7 +4527,7 @@
 			.amux   = LINE2,
 			.tv     = 1,
 			.gpio   = 0x624000,
-	}, {
+		}, {
 			.name   = name_comp1,
 			.vmux   = 1,
 			.amux   = LINE1,
  
@@ -4564,14 +4564,48 @@
 			.tv   = 1,
 		}, {
 			.name = name_comp,
-		       .vmux = 4,
-		       .amux = LINE1,
+			.vmux = 4,
+			.amux = LINE1,
 		}, {
 			.name = name_svideo,
 			.vmux = 8,
 			.amux = LINE1,
 		} },
 	},
+	[SAA7134_BOARD_ASUSTeK_TIGER] = {
+		.name           = "Asus Tiger Rev:1.00",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TDA8290,
+		.radio_type     = UNSET,
+		.tuner_addr	= ADDR_UNSET,
+		.radio_addr	= ADDR_UNSET,
+		.tuner_config   = 0,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.gpiomask       = 0x0200000,
+		.inputs = { {
+			.name   = name_tv,
+			.vmux   = 1,
+			.amux   = TV,
+			.tv     = 1,
+		}, {
+			.name   = name_comp1,
+			.vmux   = 3,
+			.amux   = LINE2,
+		}, {
+			.name   = name_comp2,
+			.vmux   = 0,
+			.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);
@@ -5358,8 +5392,8 @@
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
 		.subvendor    = 0x1043,
-		.subdevice    = 0x4857,
-		.driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
+		.subdevice    = 0x4857,		/* REV:1.00 */
+		.driver_data  = SAA7134_BOARD_ASUSTeK_TIGER,
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -6177,6 +6211,7 @@
 	case SAA7134_BOARD_PINNACLE_PCTV_310i:
 	case SAA7134_BOARD_KWORLD_DVBT_210:
 	case SAA7134_BOARD_TEVION_DVBT_220RF:
+	case SAA7134_BOARD_ASUSTeK_TIGER:
 	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
 	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
 	case SAA7134_BOARD_MEDION_MD8800_QUADRO:
@@ -1335,6 +1335,11 @@
 			}
 		}
 		break;
+	case SAA7134_BOARD_ASUSTeK_TIGER:
+		if (configure_tda827x_fe(dev, &philips_tiger_config,
+					 &tda827x_cfg_0) < 0)
+			goto dettach_frontend;
+		break;
 	default:
 		wprintk("Huh? unknown DVB card?\n");
 		break;
@@ -274,6 +274,7 @@
 #define SAA7134_BOARD_AVERMEDIA_M135A    149
 #define SAA7134_BOARD_REAL_ANGEL_220     150
 #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151
+#define SAA7134_BOARD_ASUSTeK_TIGER         152
  
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
...	...	@@ -76,7 +76,7 @@
76	76	75 -> AVerMedia AVerTVHD MCE A180 [1461:1044]
77	77	76 -> SKNet MonsterTV Mobile [1131:4ee9]
78	78	77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e]
79		- 78 -> ASUSTeK P7131 Dual [1043:4862,1043:4857]
	79	+ 78 -> ASUSTeK P7131 Dual [1043:4862]
80	80	79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
81	81	80 -> ASUS Digimatrix TV [1043:0210]
82	82	81 -> Philips Tiger reference design [1131:2018]
...	...	@@ -150,4 +150,5 @@
150	150	149 -> Avermedia PCI pure analog (M135A) [1461:f11d]
151	151	150 -> Zogis Real Angel 220
152	152	151 -> ADS Tech Instant HDTV [1421:0380]
	153	+152 -> Asus Tiger Rev:1.00 [1043:4857]
...	...	@@ -4527,7 +4527,7 @@
4527	4527	.amux = LINE2,
4528	4528	.tv = 1,
4529	4529	.gpio = 0x624000,
4530		- }, {
	4530	+ }, {
4531	4531	.name = name_comp1,
4532	4532	.vmux = 1,
4533	4533	.amux = LINE1,
4534	4534
...	...	@@ -4564,14 +4564,48 @@
4564	4564	.tv = 1,
4565	4565	}, {
4566	4566	.name = name_comp,
4567		- .vmux = 4,
4568		- .amux = LINE1,
	4567	+ .vmux = 4,
	4568	+ .amux = LINE1,
4569	4569	}, {
4570	4570	.name = name_svideo,
4571	4571	.vmux = 8,
4572	4572	.amux = LINE1,
4573	4573	} },
4574	4574	},
	4575	+ [SAA7134_BOARD_ASUSTeK_TIGER] = {
	4576	+ .name = "Asus Tiger Rev:1.00",
	4577	+ .audio_clock = 0x00187de7,
	4578	+ .tuner_type = TUNER_PHILIPS_TDA8290,
	4579	+ .radio_type = UNSET,
	4580	+ .tuner_addr = ADDR_UNSET,
	4581	+ .radio_addr = ADDR_UNSET,
	4582	+ .tuner_config = 0,
	4583	+ .mpeg = SAA7134_MPEG_DVB,
	4584	+ .gpiomask = 0x0200000,
	4585	+ .inputs = { {
	4586	+ .name = name_tv,
	4587	+ .vmux = 1,
	4588	+ .amux = TV,
	4589	+ .tv = 1,
	4590	+ }, {
	4591	+ .name = name_comp1,
	4592	+ .vmux = 3,
	4593	+ .amux = LINE2,
	4594	+ }, {
	4595	+ .name = name_comp2,
	4596	+ .vmux = 0,
	4597	+ .amux = LINE2,
	4598	+ }, {
	4599	+ .name = name_svideo,
	4600	+ .vmux = 8,
	4601	+ .amux = LINE2,
	4602	+ } },
	4603	+ .radio = {
	4604	+ .name = name_radio,
	4605	+ .amux = TV,
	4606	+ .gpio = 0x0200000,
	4607	+ },
	4608	+ },
4575	4609	};
4576	4610
4577	4611	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
...	...	@@ -5358,8 +5392,8 @@
5358	5392	.vendor = PCI_VENDOR_ID_PHILIPS,
5359	5393	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5360	5394	.subvendor = 0x1043,
5361		- .subdevice = 0x4857,
5362		- .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
	5395	+ .subdevice = 0x4857, /* REV:1.00 */
	5396	+ .driver_data = SAA7134_BOARD_ASUSTeK_TIGER,
5363	5397	},{
5364	5398	.vendor = PCI_VENDOR_ID_PHILIPS,
5365	5399	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
...	...	@@ -6177,6 +6211,7 @@
6177	6211	case SAA7134_BOARD_PINNACLE_PCTV_310i:
6178	6212	case SAA7134_BOARD_KWORLD_DVBT_210:
6179	6213	case SAA7134_BOARD_TEVION_DVBT_220RF:
	6214	+ case SAA7134_BOARD_ASUSTeK_TIGER:
6180	6215	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
6181	6216	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
6182	6217	case SAA7134_BOARD_MEDION_MD8800_QUADRO:
...	...	@@ -1335,6 +1335,11 @@
1335	1335	}
1336	1336	}
1337	1337	break;
	1338	+ case SAA7134_BOARD_ASUSTeK_TIGER:
	1339	+ if (configure_tda827x_fe(dev, &philips_tiger_config,
	1340	+ &tda827x_cfg_0) < 0)
	1341	+ goto dettach_frontend;
	1342	+ break;
1338	1343	default:
1339	1344	wprintk("Huh? unknown DVB card?\n");
1340	1345	break;
...	...	@@ -274,6 +274,7 @@
274	274	#define SAA7134_BOARD_AVERMEDIA_M135A 149
275	275	#define SAA7134_BOARD_REAL_ANGEL_220 150
276	276	#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151
	277	+#define SAA7134_BOARD_ASUSTeK_TIGER 152
277	278
278	279	#define SAA7134_MAXBOARDS 8
279	280	#define SAA7134_INPUT_MAX 8