summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-06-19 07:45:27 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-06-19 07:45:27 +0000
commita64154fc3d7c68f12b9919eaebfaff856214664b (patch)
treeaa6761171b59c49aeb344fb8dc0c079b056445bc /linux/drivers
parent9c1b9cae4b1b1302640375cb1b6fa91ecd706bef (diff)
downloadmediapointer-dvb-s2-a64154fc3d7c68f12b9919eaebfaff856214664b.tar.gz
mediapointer-dvb-s2-a64154fc3d7c68f12b9919eaebfaff856214664b.tar.bz2
* saa7134-cards.c, saa7134.h:
- Add new card entry for Compro VideoMate TV Gold+II. Thanks to Elshin Roman <roxmail@list.ru>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c42
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h3
2 files changed, 41 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 46d3617f3..14a7346af 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.66 2005/06/17 14:54:25 nsh Exp $
+ * $Id: saa7134-cards.c,v 1.67 2005/06/19 07:45:27 nsh Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -1692,8 +1692,44 @@ struct saa7134_board saa7134_boards[] = {
.name = name_mute,
.amux = LINE1,
},
- },
- };
+ },
+ [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII] = {
+ .name = "Compro VideoMate TV Gold+II",
+ .audio_clock = 0x002187de7,
+ .tuner_type = TUNER_LG_PAL_NEW_TAPC,
+ .radio_type = TUNER_TEA5767,
+ .tuner_addr = 0x63,
+ .radio_addr = 0x60,
+ .gpiomask = 0x8c1880,
+ .inputs = {{
+ .name = name_svideo,
+ .vmux = 0,
+ .amux = LINE1,
+ .gpio = 0x800800,
+ },{
+ .name = name_comp1,
+ .vmux = 3,
+ .amux = LINE1,
+ .gpio = 0x801000,
+ },{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = TV,
+ .tv = 1,
+ .gpio = 0x800000,
+ }},
+ .radio = {
+ .name = name_radio,
+ .amux = TV,
+ .gpio = 0x880000,
+ },
+ .mute = {
+ .name = name_mute,
+ .amux = LINE2,
+ .gpio = 0x840000,
+ },
+ },
+};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 3cf135ffd..6b0d7c7ce 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.44 2005/06/14 22:38:46 hhackmann Exp $
+ * $Id: saa7134.h,v 1.45 2005/06/19 07:45:27 nsh Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -193,6 +193,7 @@ struct saa7134_format {
#define SAA7134_BOARD_KWORLD_VSTREAM_XPERT 59
#define SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS 60
#define SAA7134_BOARD_PHILIPS_TOUGH 61
+#define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8