1 files changed, 122 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 4ea479baee74..50f15adfa7c8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1170,6 +1170,42 @@ struct saa7134_board saa7134_boards[] = {
                        .amux   = LINE2,
                },
        },
+    [SAA7134_BOARD_ECS_TVP3XP_4CB6] = {
+                /* Barry Scott <barry.scott@onelan.co.uk> */
+                .name           = "Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM)",
+                .audio_clock    = 0x187de7,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_tv_mono,
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                },{
+                        .name   = "CVid over SVid",
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE2,
+                },
+        },
        [SAA7134_BOARD_AVACSSMARTTV] = {
                /* Roman Pszonczenko <romka@kolos.math.uni.lodz.pl> */
                .name           = "AVACS SmartTV",
@@ -2754,6 +2790,35 @@ struct saa7134_board saa7134_boards[] = {
                        .amux   = LINE1,
                },
        },
+        [SAA7134_BOARD_KWORLD_DVBT_210] = {
+                .name           = "KWorld DVB-T 210",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 1 << 21,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
        [SAA7134_BOARD_KWORLD_ATSC110] = {
                .name           = "Kworld ATSC110",
                .audio_clock    = 0x00187de7,
@@ -3407,6 +3472,36 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x0200000,
                },
        },
+        [SAA7134_BOARD_SABRENT_TV_PCB05] = {
+                .name           = "Sabrent PCMCIA TV-PCB05",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                },
+        },
 };
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3515,7 +3610,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
-                .subdevice    = 0x0214, /* Standard PCI, LR214WF */
+                .subdevice    = 0x0214, /* Standard PCI, LR214 Rev E and earlier (SAA7135) */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
+                .subdevice    = 0x5214, /* Standard PCI, LR214 Rev F onwards (SAA7131) */
                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3689,6 +3790,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB5,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x1019,
+                .subdevice    = 0x4cb6,
+                .driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB6,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x12ab,
                .subdevice    = 0x0800,
@@ -3915,6 +4022,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .driver_data  = SAA7134_BOARD_TEVION_DVBT_220RF,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x17de,
+                .subdevice    = 0x7250,
+                .driver_data  = SAA7134_BOARD_KWORLD_DVBT_210,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
                .subvendor    = 0x17de,
                .subdevice    = 0x7350,
@@ -4100,6 +4213,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subdevice    = 0x4857,
                .driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x0919, /* SinoVideo PCI 2309 Proteus (7134) */
+                .subdevice    = 0x2003, /* OEM cardbus */
+                .driver_data  = SAA7134_BOARD_SABRENT_TV_PCB05,
+        },{
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4178,6 +4297,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_CINERGY600_MK3:
        case SAA7134_BOARD_ECS_TVP3XP:
        case SAA7134_BOARD_ECS_TVP3XP_4CB5:
+        case SAA7134_BOARD_ECS_TVP3XP_4CB6:
        case SAA7134_BOARD_MD2819:
        case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
        case SAA7134_BOARD_KWORLD_XPERT:
@@ -4426,6 +4546,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                }
                break;
        case SAA7134_BOARD_PINNACLE_PCTV_310i:
+        case SAA7134_BOARD_KWORLD_DVBT_210:
        case SAA7134_BOARD_TEVION_DVBT_220RF:
        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
        case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 4ea479baee74..50f15adfa7c8 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1170,6 +1170,42 @@ struct saa7134_board saa7134_boards[] = {
1170	.amux = LINE2,	1170	.amux = LINE2,
1171	},	1171	},
1172	},	1172	},
		1173	[SAA7134_BOARD_ECS_TVP3XP_4CB6] = {
		1174	/* Barry Scott <barry.scott@onelan.co.uk> */
		1175	.name = "Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM)",
		1176	.audio_clock = 0x187de7,
		1177	.tuner_type = TUNER_PHILIPS_PAL_I,
		1178	.radio_type = UNSET,
		1179	.tuner_addr = ADDR_UNSET,
		1180	.radio_addr = ADDR_UNSET,
		1181	.inputs = {{
		1182	.name = name_tv,
		1183	.vmux = 1,
		1184	.amux = TV,
		1185	.tv = 1,
		1186	},{
		1187	.name = name_tv_mono,
		1188	.vmux = 1,
		1189	.amux = LINE2,
		1190	.tv = 1,
		1191	},{
		1192	.name = name_comp1,
		1193	.vmux = 3,
		1194	.amux = LINE1,
		1195	},{
		1196	.name = name_svideo,
		1197	.vmux = 8,
		1198	.amux = LINE1,
		1199	},{
		1200	.name = "CVid over SVid",
		1201	.vmux = 0,
		1202	.amux = LINE1,
		1203	}},
		1204	.radio = {
		1205	.name = name_radio,
		1206	.amux = LINE2,
		1207	},
		1208	},
1173	[SAA7134_BOARD_AVACSSMARTTV] = {	1209	[SAA7134_BOARD_AVACSSMARTTV] = {
1174	/* Roman Pszonczenko <romka@kolos.math.uni.lodz.pl> */	1210	/* Roman Pszonczenko <romka@kolos.math.uni.lodz.pl> */
1175	.name = "AVACS SmartTV",	1211	.name = "AVACS SmartTV",
@@ -2754,6 +2790,35 @@ struct saa7134_board saa7134_boards[] = {
2754	.amux = LINE1,	2790	.amux = LINE1,
2755	},	2791	},
2756	},	2792	},
		2793	[SAA7134_BOARD_KWORLD_DVBT_210] = {
		2794	.name = "KWorld DVB-T 210",
		2795	.audio_clock = 0x00187de7,
		2796	.tuner_type = TUNER_PHILIPS_TDA8290,
		2797	.radio_type = UNSET,
		2798	.tuner_addr = ADDR_UNSET,
		2799	.radio_addr = ADDR_UNSET,
		2800	.mpeg = SAA7134_MPEG_DVB,
		2801	.gpiomask = 1 << 21,
		2802	.inputs = {{
		2803	.name = name_tv,
		2804	.vmux = 1,
		2805	.amux = TV,
		2806	.tv = 1,
		2807	},{
		2808	.name = name_comp1,
		2809	.vmux = 3,
		2810	.amux = LINE1,
		2811	},{
		2812	.name = name_svideo,
		2813	.vmux = 8,
		2814	.amux = LINE1,
		2815	}},
		2816	.radio = {
		2817	.name = name_radio,
		2818	.amux = TV,
		2819	.gpio = 0x0200000,
		2820	},
		2821	},
2757	[SAA7134_BOARD_KWORLD_ATSC110] = {	2822	[SAA7134_BOARD_KWORLD_ATSC110] = {
2758	.name = "Kworld ATSC110",	2823	.name = "Kworld ATSC110",
2759	.audio_clock = 0x00187de7,	2824	.audio_clock = 0x00187de7,
@@ -3407,6 +3472,36 @@ struct saa7134_board saa7134_boards[] = {
3407	.gpio = 0x0200000,	3472	.gpio = 0x0200000,
3408	},	3473	},
3409	},	3474	},
		3475	[SAA7134_BOARD_SABRENT_TV_PCB05] = {
		3476	.name = "Sabrent PCMCIA TV-PCB05",
		3477	.audio_clock = 0x00187de7,
		3478	.tuner_type = TUNER_PHILIPS_TDA8290,
		3479	.radio_type = UNSET,
		3480	.tuner_addr = ADDR_UNSET,
		3481	.radio_addr = ADDR_UNSET,
		3482	.inputs = {{
		3483	.name = name_tv,
		3484	.vmux = 1,
		3485	.amux = TV,
		3486	.tv = 1,
		3487	},{
		3488	.name = name_comp1,
		3489	.vmux = 3,
		3490	.amux = LINE1,
		3491	},{
		3492	.name = name_comp2,
		3493	.vmux = 0,
		3494	.amux = LINE1,
		3495	},{
		3496	.name = name_svideo,
		3497	.vmux = 8,
		3498	.amux = LINE1,
		3499	}},
		3500	.mute = {
		3501	.name = name_mute,
		3502	.amux = TV,
		3503	},
		3504	},
3410	};	3505	};
3411		3506
3412	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);	3507	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3515,7 +3610,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
3515	.vendor = PCI_VENDOR_ID_PHILIPS,	3610	.vendor = PCI_VENDOR_ID_PHILIPS,
3516	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,	3611	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3517	.subvendor = 0x5168, /* Animation Technologies (LifeView) */	3612	.subvendor = 0x5168, /* Animation Technologies (LifeView) */
3518	.subdevice = 0x0214, /* Standard PCI, LR214WF */	3613	.subdevice = 0x0214, /* Standard PCI, LR214 Rev E and earlier (SAA7135) */
		3614	.driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM,
		3615	},{
		3616	.vendor = PCI_VENDOR_ID_PHILIPS,
		3617	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		3618	.subvendor = 0x5168, /* Animation Technologies (LifeView) */
		3619	.subdevice = 0x5214, /* Standard PCI, LR214 Rev F onwards (SAA7131) */
3519	.driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM,	3620	.driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM,
3520	},{	3621	},{
3521	.vendor = PCI_VENDOR_ID_PHILIPS,	3622	.vendor = PCI_VENDOR_ID_PHILIPS,
@@ -3689,6 +3790,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3689	.driver_data = SAA7134_BOARD_ECS_TVP3XP_4CB5,	3790	.driver_data = SAA7134_BOARD_ECS_TVP3XP_4CB5,
3690	},{	3791	},{
3691	.vendor = PCI_VENDOR_ID_PHILIPS,	3792	.vendor = PCI_VENDOR_ID_PHILIPS,
		3793	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		3794	.subvendor = 0x1019,
		3795	.subdevice = 0x4cb6,
		3796	.driver_data = SAA7134_BOARD_ECS_TVP3XP_4CB6,
		3797	},{
		3798	.vendor = PCI_VENDOR_ID_PHILIPS,
3692	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,	3799	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3693	.subvendor = 0x12ab,	3800	.subvendor = 0x12ab,
3694	.subdevice = 0x0800,	3801	.subdevice = 0x0800,
@@ -3915,6 +4022,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3915	.driver_data = SAA7134_BOARD_TEVION_DVBT_220RF,	4022	.driver_data = SAA7134_BOARD_TEVION_DVBT_220RF,
3916	},{	4023	},{
3917	.vendor = PCI_VENDOR_ID_PHILIPS,	4024	.vendor = PCI_VENDOR_ID_PHILIPS,
		4025	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		4026	.subvendor = 0x17de,
		4027	.subdevice = 0x7250,
		4028	.driver_data = SAA7134_BOARD_KWORLD_DVBT_210,
		4029	},{
		4030	.vendor = PCI_VENDOR_ID_PHILIPS,
3918	.device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */	4031	.device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
3919	.subvendor = 0x17de,	4032	.subvendor = 0x17de,
3920	.subdevice = 0x7350,	4033	.subdevice = 0x7350,
@@ -4100,6 +4213,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4100	.subdevice = 0x4857,	4213	.subdevice = 0x4857,
4101	.driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,	4214	.driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
4102	},{	4215	},{
		4216	.vendor = PCI_VENDOR_ID_PHILIPS,
		4217	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		4218	.subvendor = 0x0919, /* SinoVideo PCI 2309 Proteus (7134) */
		4219	.subdevice = 0x2003, /* OEM cardbus */
		4220	.driver_data = SAA7134_BOARD_SABRENT_TV_PCB05,
		4221	},{
4103	/* --- boards without eeprom + subsystem ID --- */	4222	/* --- boards without eeprom + subsystem ID --- */
4104	.vendor = PCI_VENDOR_ID_PHILIPS,	4223	.vendor = PCI_VENDOR_ID_PHILIPS,
4105	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,	4224	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4178,6 +4297,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
4178	case SAA7134_BOARD_CINERGY600_MK3:	4297	case SAA7134_BOARD_CINERGY600_MK3:
4179	case SAA7134_BOARD_ECS_TVP3XP:	4298	case SAA7134_BOARD_ECS_TVP3XP:
4180	case SAA7134_BOARD_ECS_TVP3XP_4CB5:	4299	case SAA7134_BOARD_ECS_TVP3XP_4CB5:
		4300	case SAA7134_BOARD_ECS_TVP3XP_4CB6:
4181	case SAA7134_BOARD_MD2819:	4301	case SAA7134_BOARD_MD2819:
4182	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:	4302	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
4183	case SAA7134_BOARD_KWORLD_XPERT:	4303	case SAA7134_BOARD_KWORLD_XPERT:
@@ -4426,6 +4546,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
4426	}	4546	}
4427	break;	4547	break;
4428	case SAA7134_BOARD_PINNACLE_PCTV_310i:	4548	case SAA7134_BOARD_PINNACLE_PCTV_310i:
		4549	case SAA7134_BOARD_KWORLD_DVBT_210:
4429	case SAA7134_BOARD_TEVION_DVBT_220RF:	4550	case SAA7134_BOARD_TEVION_DVBT_220RF:
4430	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:	4551	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
4431	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:	4552	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: