summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorRicardo Cerqueira <devnull@localhost>2005-11-10 02:29:25 +0000
committerRicardo Cerqueira <devnull@localhost>2005-11-10 02:29:25 +0000
commit1cf398ff53ade8f68b76983ff33c737cc1252a5e (patch)
tree4cc51c52b8d246f18ef3ae6f09a295f84088ac4b /linux/drivers/media/video/saa7134
parentb1b1574e4e2b44751d2a18c065799830a2836354 (diff)
downloadmediapointer-dvb-s2-1cf398ff53ade8f68b76983ff33c737cc1252a5e.tar.gz
mediapointer-dvb-s2-1cf398ff53ade8f68b76983ff33c737cc1252a5e.tar.bz2
Added new saa7134 card (MSI TV@anywhere plus)
From: Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c34
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h3
2 files changed, 35 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index c6c03488f..e98acff11 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.114 2005/11/05 03:07:43 rmcc Exp $
+ * $Id: saa7134-cards.c,v 1.115 2005/11/10 02:29:25 rmcc Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2531,6 +2531,32 @@ struct saa7134_board saa7134_boards[] = {
.amux = LINE1,
}},
},
+ [SAA7134_BOARD_MSI_TVATANYWHERE_PLUS] = {
+ .name = "MSI TV@Anywhere plus",
+ .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_svideo,
+ .vmux = 0,
+ .amux = LINE1,
+ }},
+ .radio = {
+ .name = name_radio,
+ .amux = LINE1,
+ },
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2972,6 +2998,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subdevice = 0x2018,
.driver_data = SAA7134_BOARD_PHILIPS_TIGER,
},{
+ .vendor = PCI_VENDOR_ID_PHILIPS,
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
+ .subvendor = 0x1462,
+ .subdevice = 0x6231,
+ .driver_data = SAA7134_BOARD_MSI_TVATANYWHERE_PLUS,
+ },{
/* --- boards without eeprom + subsystem ID --- */
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 1f46d7e4b..6f387abb5 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.80 2005/11/09 03:33:33 rmcc Exp $
+ * $Id: saa7134.h,v 1.81 2005/11/10 02:29:25 rmcc Exp $
*
* v4l2 device driver for philips saa7134 based TV cards
*
@@ -215,6 +215,7 @@ struct saa7134_format {
#define SAA7134_BOARD_SEDNA_PC_TV_CARDBUS 79
#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
#define SAA7134_BOARD_PHILIPS_TIGER 81
+#define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS 82
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8