aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c48
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-oss.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-reg.h1
-rw-r--r--drivers/media/video/saa7134/saa7134-ts.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-vbi.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c25
-rw-r--r--drivers/media/video/saa7134/saa7134.h4
14 files changed, 51 insertions, 37 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 1b5a3a9ffbe2..9c8b1ca1ccc0 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -62,3 +62,4 @@
62 61 -> Philips TOUGH DVB-T reference design [1131:2004] 62 61 -> Philips TOUGH DVB-T reference design [1131:2004]
63 62 -> Compro VideoMate TV Gold+II 63 62 -> Compro VideoMate TV Gold+II
64 63 -> Kworld Xpert TV PVR7134 64 63 -> Kworld Xpert TV PVR7134
65 64 -> FlyTV mini Asus Digimatrix [1043:0210,1043:0210]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 88b71a20b602..c277b3b46512 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.
@@ -2001,6 +2000,41 @@ 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 },
2004}; 2038};
2005 2039
2006 2040
@@ -2346,6 +2380,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
2346 .subvendor = 0x4e42, 2380 .subvendor = 0x4e42,
2347 .subdevice = 0x0502, 2381 .subdevice = 0x0502,
2348 .driver_data = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS, 2382 .driver_data = SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS,
2383 },{
2384 .vendor = PCI_VENDOR_ID_PHILIPS,
2385 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2386 .subvendor = 0x1043,
2387 .subdevice = 0x0210, /* mini pci NTSC version */
2388 .driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX,
2389 },{
2390 .vendor = PCI_VENDOR_ID_PHILIPS,
2391 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2392 .subvendor = 0x1043,
2393 .subdevice = 0x0210, /* mini pci PAL/SECAM version */
2394 .driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX,
2349 2395
2350 },{ 2396 },{
2351 /* --- boards without eeprom + subsystem ID --- */ 2397 /* --- boards without eeprom + subsystem ID --- */
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 1dbe61755e9f..e5e36f3c6250 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-core.c,v 1.39 2005/07/05 17:37:35 nsh Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * driver core 4 * driver core
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 8be6a90358c8..fa29dd5f7f04 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-dvb.c,v 1.23 2005/07/24 22:12:47 mkrufky Exp $
3 * 2 *
4 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] 3 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
5 * 4 *
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index c85348d0239f..77b627eb6483 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-empress.c,v 1.11 2005/05/22 19:23:39 nsh Exp $
3 * 2 *
4 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] 3 * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
5 * 4 *
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index eae6b529713f..711aa8e85fac 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-i2c.c,v 1.22 2005/07/22 04:09:41 mkrufky Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * i2c interface support 4 * i2c interface support
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 213740122fe6..0e97b1eec20e 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-input.c,v 1.21 2005/06/22 23:37:34 nsh Exp $
3 * 2 *
4 * handle saa7134 IR remotes via linux kernel input layer. 3 * handle saa7134 IR remotes via linux kernel input layer.
5 * 4 *
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index b5bede95dbf5..c20630c82f1c 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * oss dsp interface 4 * oss dsp interface
diff --git a/drivers/media/video/saa7134/saa7134-reg.h b/drivers/media/video/saa7134/saa7134-reg.h
index 87734f22af7d..ae0c7a165390 100644
--- a/drivers/media/video/saa7134/saa7134-reg.h
+++ b/drivers/media/video/saa7134/saa7134-reg.h
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-reg.h,v 1.2 2004/09/15 16:15:24 kraxel Exp $
3 * 2 *
4 * philips saa7134 registers 3 * philips saa7134 registers
5 */ 4 */
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 4dd9f1b23928..463885601ab4 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-ts.c,v 1.15 2005/06/14 22:48:18 hhackmann Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * video4linux video interface 4 * video4linux video interface
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index eeafa5a71d2b..badf2f9e3072 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-tvaudio.c,v 1.30 2005/06/28 23:41:47 mkrufky Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * tv audio decoder (fm stereo, nicam, ...) 4 * tv audio decoder (fm stereo, nicam, ...)
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index 29e51cad2aaf..f4aee0af80e1 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-vbi.c,v 1.7 2005/05/24 23:13:06 nsh Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * video4linux video interface 4 * video4linux video interface
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index a4c2f751d097..35e5e85f669a 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134-video.c,v 1.36 2005/06/28 23:41:47 mkrufky Exp $
3 * 2 *
4 * device driver for philips saa7134 based TV cards 3 * device driver for philips saa7134 based TV cards
5 * video4linux video interface 4 * video4linux video interface
@@ -1368,29 +1367,7 @@ static int video_release(struct inode *inode, struct file *file)
1368 saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); 1367 saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0);
1369 saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); 1368 saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0);
1370 1369
1371 if (dev->tuner_type == TUNER_PHILIPS_TDA8290) { 1370 saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
1372 u8 data[2];
1373 int ret;
1374 struct i2c_msg msg = {.addr=I2C_ADDR_TDA8290, .flags=0, .buf=data, .len = 2};
1375 data[0] = 0x21;
1376 data[1] = 0xc0;
1377 ret = i2c_transfer(&dev->i2c_adap, &msg, 1);
1378 if (ret != 1)
1379 printk(KERN_ERR "TDA8290 access failure\n");
1380 msg.addr = I2C_ADDR_TDA8275;
1381 data[0] = 0x30;
1382 data[1] = 0xd0;
1383 ret = i2c_transfer(&dev->i2c_adap, &msg, 1);
1384 if (ret != 1)
1385 printk(KERN_ERR "TDA8275 access failure\n");
1386 msg.addr = I2C_ADDR_TDA8290;
1387 data[0] = 0x21;
1388 data[1] = 0x80;
1389 i2c_transfer(&dev->i2c_adap, &msg, 1);
1390 data[0] = 0x00;
1391 data[1] = 0x02;
1392 i2c_transfer(&dev->i2c_adap, &msg, 1);
1393 }
1394 1371
1395 /* free stuff */ 1372 /* free stuff */
1396 videobuf_mmap_free(&fh->cap); 1373 videobuf_mmap_free(&fh->cap);
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 2af0cb2a731b..7a7fa42e1d22 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,4 @@
1/* 1/*
2 * $Id: saa7134.h,v 1.49 2005/07/13 17:25:25 mchehab Exp $
3 * 2 *
4 * v4l2 device driver for philips saa7134 based TV cards 3 * v4l2 device driver for philips saa7134 based TV cards
5 * 4 *
@@ -20,7 +19,7 @@
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 */ 20 */
22 21
23#include <linux/version.h> 22#include <linux/utsname.h>
24#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14) 23#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
25 24
26#include <linux/pci.h> 25#include <linux/pci.h>
@@ -185,6 +184,7 @@ struct saa7134_format {
185#define SAA7134_BOARD_PHILIPS_TOUGH 61 184#define SAA7134_BOARD_PHILIPS_TOUGH 61
186#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62 185#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62
187#define SAA7134_BOARD_KWORLD_XPERT 63 186#define SAA7134_BOARD_KWORLD_XPERT 63
187#define SAA7134_BOARD_FLYTV_DIGIMATRIX 64
188 188
189#define SAA7134_MAXBOARDS 8 189#define SAA7134_MAXBOARDS 8
190#define SAA7134_INPUT_MAX 8 190#define SAA7134_INPUT_MAX 8
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-17 23:09:25 -0500