summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-08-21 19:03:29 +0000
committerMichael Krufky <devnull@localhost>2005-08-21 19:03:29 +0000
commite6a32dbb2b83929ba70fa3c01e7534ba17de7a23 (patch)
tree4f0e91b5b839a288c063568067cb21668a01fc19 /linux/drivers/media/video/saa7134
parent37029c256cae66ff0b0f2e128299ab214e89288e (diff)
downloadmediapointer-dvb-s2-e6a32dbb2b83929ba70fa3c01e7534ba17de7a23.tar.gz
mediapointer-dvb-s2-e6a32dbb2b83929ba70fa3c01e7534ba17de7a23.tar.bz2
- Add saa713x card #65
Kworld V-Stream Studio TV Terminator Thanks to: James R Webb <jrwebb@qwest.net> and Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c35
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h3
2 files changed, 36 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index d4be4938f..9552fe63a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.83 2005/08/04 04:01:28 nsh Exp $
+ * $Id: saa7134-cards.c,v 1.84 2005/08/21 19:03:29 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2037,6 +2037,39 @@ struct saa7134_board saa7134_boards[] = {
.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,
+ },
+ },
};
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 2b769099f..587ea700c 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134.h,v 1.50 2005/08/04 04:01:28 nsh Exp $
+ * $Id: saa7134.h,v 1.51 2005/08/21 19:03:29 mkrufky Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -196,6 +196,7 @@ struct saa7134_format {
#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62
#define SAA7134_BOARD_KWORLD_XPERT 63
#define SAA7134_BOARD_FLYTV_DIGIMATRIX 64
+#define SAA7134_BOARD_KWORLD_TERMINATOR 65
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8