1 files changed, 123 insertions, 9 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 88b71a20b602..acc7a4335e23 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,4 @@
 /*
- * $Id: saa7134-cards.c,v 1.80 2005/07/07 01:49:30 mkrufky Exp $
 *
 * device driver for philips saa7134 based TV cards
 * card-specific stuff.
@@ -1373,7 +1372,7 @@ struct saa7134_board saa7134_boards[] = {
                .inputs         = {{
                        .name = name_comp1,
                        .vmux = 1,
-                        .amux = LINE2,
+                        .amux = LINE1,
                },{
                        .name = name_tv,
                        .vmux = 3,
@@ -1382,7 +1381,7 @@ struct saa7134_board saa7134_boards[] = {
                },{
                        .name = name_svideo,
                        .vmux = 8,
-                        .amux = LINE2,
+                        .amux = LINE1,
                }},
                .radio = {
                        .name   = name_radio,
@@ -2001,6 +2000,115 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x000,
                },
        },
+        [SAA7134_BOARD_FLYTV_DIGIMATRIX] = {
+                .name           = "FlyTV mini Asus Digimatrix",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_LG_NTSC_TALN_MINI,
+                .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 = 0,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp2,
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+                .radio = {
+                        .name = name_radio,             /* radio unconfirmed */
+                        .amux = LINE2,
+                },
+        },
+        [SAA7134_BOARD_KWORLD_TERMINATOR] = {
+                /* Kworld V-Stream Studio TV Terminator */
+                /* "James Webb <jrwebb@qwest.net> */
+                .name           = "V-Stream Studio TV Terminator",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 1 << 21,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .gpio = 0x0000000,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                        .gpio = 0x0000000,
+                },{
+                        .name = name_svideo,    /* S-Video input */
+                        .vmux = 8,
+                        .amux = LINE2,
+                        .gpio = 0x0000000,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_YUAN_TUN900] = {
+                /* FIXME:
+                 * S-Video and composite sources untested.
+                 * Radio not working.
+                 * Remote control not yet implemented.
+                 * From : codemaster@webgeeks.be */
+                .name           = "Yuan TUN-900 (saa7135)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr= ADDR_UNSET,
+                .radio_addr= ADDR_UNSET,
+                .gpiomask       = 0x00010003,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                        .gpio = 0x01,
+                },{
+                        .name = name_comp1,
+                        .vmux = 0,
+                        .amux = LINE2,
+                        .gpio = 0x02,
+                },{
+                        .name = name_svideo,
+                        .vmux = 6,
+                        .amux = LINE2,
+                        .gpio = 0x02,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE1,
+                        .gpio = 0x00010003,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x01,
+                },
+        },
 };
@@ -2272,12 +2380,6 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .driver_data  = SAA7134_BOARD_VIDEOMATE_TV_PVR,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
-                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
-                .subvendor    = 0x1131,
-                .subdevice    = 0,
-                .driver_data  = SAA7134_BOARD_SABRENT_SBTTVFM,
-        },{
-                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
                .subdevice    = 0x9715,
@@ -2346,6 +2448,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x4e42,
                .subdevice    = 0x0502,
                .driver_data  = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x0210,         /* mini pci NTSC version */
+                .driver_data  = SAA7134_BOARD_FLYTV_DIGIMATRIX,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x0210,         /* mini pci PAL/SECAM version */
+                .driver_data  = SAA7134_BOARD_FLYTV_DIGIMATRIX,
        },{
                /* --- boards without eeprom + subsystem ID --- */

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 88b71a20b602..acc7a4335e23 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,4 @@
1	/*	1	/*
2	* $Id: saa7134-cards.c,v 1.80 2005/07/07 01:49:30 mkrufky Exp $
3	*	2	*
4	* device driver for philips saa7134 based TV cards	3	* device driver for philips saa7134 based TV cards
5	* card-specific stuff.	4	* card-specific stuff.
@@ -1373,7 +1372,7 @@ struct saa7134_board saa7134_boards[] = {
1373	.inputs = {{	1372	.inputs = {{
1374	.name = name_comp1,	1373	.name = name_comp1,
1375	.vmux = 1,	1374	.vmux = 1,
1376	.amux = LINE2,	1375	.amux = LINE1,
1377	},{	1376	},{
1378	.name = name_tv,	1377	.name = name_tv,
1379	.vmux = 3,	1378	.vmux = 3,
@@ -1382,7 +1381,7 @@ struct saa7134_board saa7134_boards[] = {
1382	},{	1381	},{
1383	.name = name_svideo,	1382	.name = name_svideo,
1384	.vmux = 8,	1383	.vmux = 8,
1385	.amux = LINE2,	1384	.amux = LINE1,
1386	}},	1385	}},
1387	.radio = {	1386	.radio = {
1388	.name = name_radio,	1387	.name = name_radio,
@@ -2001,6 +2000,115 @@ struct saa7134_board saa7134_boards[] = {
2001	.gpio = 0x000,	2000	.gpio = 0x000,
2002	},	2001	},
2003	},	2002	},
		2003	[SAA7134_BOARD_FLYTV_DIGIMATRIX] = {
		2004	.name = "FlyTV mini Asus Digimatrix",
		2005	.audio_clock = 0x00200000,
		2006	.tuner_type = TUNER_LG_NTSC_TALN_MINI,
		2007	.radio_type = UNSET,
		2008	.tuner_addr = ADDR_UNSET,
		2009	.radio_addr = ADDR_UNSET,
		2010	.inputs = {{
		2011	.name = name_tv,
		2012	.vmux = 1,
		2013	.amux = TV,
		2014	.tv = 1,
		2015	},{
		2016	.name = name_tv_mono,
		2017	.vmux = 1,
		2018	.amux = LINE2,
		2019	.tv = 1,
		2020	},{
		2021	.name = name_comp1,
		2022	.vmux = 0,
		2023	.amux = LINE2,
		2024	},{
		2025	.name = name_comp2,
		2026	.vmux = 3,
		2027	.amux = LINE2,
		2028	},{
		2029	.name = name_svideo,
		2030	.vmux = 8,
		2031	.amux = LINE2,
		2032	}},
		2033	.radio = {
		2034	.name = name_radio, /* radio unconfirmed */
		2035	.amux = LINE2,
		2036	},
		2037	},
		2038	[SAA7134_BOARD_KWORLD_TERMINATOR] = {
		2039	/* Kworld V-Stream Studio TV Terminator */
		2040	/* "James Webb <jrwebb@qwest.net> */
		2041	.name = "V-Stream Studio TV Terminator",
		2042	.audio_clock = 0x00187de7,
		2043	.tuner_type = TUNER_PHILIPS_TDA8290,
		2044	.radio_type = UNSET,
		2045	.tuner_addr = ADDR_UNSET,
		2046	.radio_addr = ADDR_UNSET,
		2047	.gpiomask = 1 << 21,
		2048	.inputs = {{
		2049	.name = name_tv,
		2050	.vmux = 1,
		2051	.amux = TV,
		2052	.gpio = 0x0000000,
		2053	.tv = 1,
		2054	},{
		2055	.name = name_comp1, /* Composite input */
		2056	.vmux = 3,
		2057	.amux = LINE2,
		2058	.gpio = 0x0000000,
		2059	},{
		2060	.name = name_svideo, /* S-Video input */
		2061	.vmux = 8,
		2062	.amux = LINE2,
		2063	.gpio = 0x0000000,
		2064	}},
		2065	.radio = {
		2066	.name = name_radio,
		2067	.amux = TV,
		2068	.gpio = 0x0200000,
		2069	},
		2070	},
		2071	[SAA7134_BOARD_YUAN_TUN900] = {
		2072	/* FIXME:
		2073	* S-Video and composite sources untested.
		2074	* Radio not working.
		2075	* Remote control not yet implemented.
		2076	* From : codemaster@webgeeks.be */
		2077	.name = "Yuan TUN-900 (saa7135)",
		2078	.audio_clock = 0x00187de7,
		2079	.tuner_type = TUNER_PHILIPS_TDA8290,
		2080	.radio_type = UNSET,
		2081	.tuner_addr= ADDR_UNSET,
		2082	.radio_addr= ADDR_UNSET,
		2083	.gpiomask = 0x00010003,
		2084	.inputs = {{
		2085	.name = name_tv,
		2086	.vmux = 1,
		2087	.amux = TV,
		2088	.tv = 1,
		2089	.gpio = 0x01,
		2090	},{
		2091	.name = name_comp1,
		2092	.vmux = 0,
		2093	.amux = LINE2,
		2094	.gpio = 0x02,
		2095	},{
		2096	.name = name_svideo,
		2097	.vmux = 6,
		2098	.amux = LINE2,
		2099	.gpio = 0x02,
		2100	}},
		2101	.radio = {
		2102	.name = name_radio,
		2103	.amux = LINE1,
		2104	.gpio = 0x00010003,
		2105	},
		2106	.mute = {
		2107	.name = name_mute,
		2108	.amux = TV,
		2109	.gpio = 0x01,
		2110	},
		2111	},
2004	};	2112	};
2005		2113
2006		2114
@@ -2272,12 +2380,6 @@ struct pci_device_id saa7134_pci_tbl[] = {
2272	.driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR,	2380	.driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR,
2273	},{	2381	},{
2274	.vendor = PCI_VENDOR_ID_PHILIPS,	2382	.vendor = PCI_VENDOR_ID_PHILIPS,
2275	.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
2276	.subvendor = 0x1131,
2277	.subdevice = 0,
2278	.driver_data = SAA7134_BOARD_SABRENT_SBTTVFM,
2279	},{
2280	.vendor = PCI_VENDOR_ID_PHILIPS,
2281	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,	2383	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2282	.subvendor = 0x1461, /* Avermedia Technologies Inc */	2384	.subvendor = 0x1461, /* Avermedia Technologies Inc */
2283	.subdevice = 0x9715,	2385	.subdevice = 0x9715,
@@ -2346,6 +2448,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
2346	.subvendor = 0x4e42,	2448	.subvendor = 0x4e42,
2347	.subdevice = 0x0502,	2449	.subdevice = 0x0502,
2348	.driver_data = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS,	2450	.driver_data = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS,
		2451	},{
		2452	.vendor = PCI_VENDOR_ID_PHILIPS,
		2453	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		2454	.subvendor = 0x1043,
		2455	.subdevice = 0x0210, /* mini pci NTSC version */
		2456	.driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX,
		2457	},{
		2458	.vendor = PCI_VENDOR_ID_PHILIPS,
		2459	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		2460	.subvendor = 0x1043,
		2461	.subdevice = 0x0210, /* mini pci PAL/SECAM version */
		2462	.driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX,
2349		2463
2350	},{	2464	},{
2351	/* --- boards without eeprom + subsystem ID --- */	2465	/* --- boards without eeprom + subsystem ID --- */