aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorRussell Kliese <russell@kliese.wattle.id.au>2008-04-22 13:42:12 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:44 -0400
commit6a6179b6db401acde5798b4da0fdff32b126ee15 (patch)
treeea781dcf80d0db87c3d3b3c2e646f1065eeea718 /drivers/media/video
parent7b5b3f1765c9773ec9b10c3e5299ac001211a80d (diff)
V4L/DVB (7230): saa7134: add support for the MSI TV@nywhere A/D v1.1 card
Signed-off-by: Russell Kliese <russell@kliese.wattle.id.au> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c36
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c3
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
3 files changed, 40 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index a827af4546d0..f9c85b7cba1a 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4034,6 +4034,36 @@ struct saa7134_board saa7134_boards[] = {
4034 .amux = LINE1, 4034 .amux = LINE1,
4035 } }, 4035 } },
4036 }, 4036 },
4037 [SAA7134_BOARD_MSI_TVANYWHERE_AD11] = {
4038 .name = "MSI TV@nywhere A/D v1.1",
4039 .audio_clock = 0x00187de7,
4040 .tuner_type = TUNER_PHILIPS_TDA8290,
4041 .radio_type = UNSET,
4042 .tuner_addr = ADDR_UNSET,
4043 .radio_addr = ADDR_UNSET,
4044 .tuner_config = 2,
4045 .mpeg = SAA7134_MPEG_DVB,
4046 .gpiomask = 0x0200000,
4047 .inputs = { {
4048 .name = name_tv,
4049 .vmux = 1,
4050 .amux = TV,
4051 .tv = 1,
4052 }, {
4053 .name = name_comp1,
4054 .vmux = 3,
4055 .amux = LINE1,
4056 }, {
4057 .name = name_svideo,
4058 .vmux = 8,
4059 .amux = LINE1,
4060 } },
4061 .radio = {
4062 .name = name_radio,
4063 .amux = TV,
4064 .gpio = 0x0200000,
4065 },
4066 },
4037}; 4067};
4038 4068
4039const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 4069const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4990,6 +5020,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4990 .subvendor = 0x16be, 5020 .subvendor = 0x16be,
4991 .subdevice = 0x0010, /* Medion version CTX953_V.1.4.3 */ 5021 .subdevice = 0x0010, /* Medion version CTX953_V.1.4.3 */
4992 .driver_data = SAA7134_BOARD_CREATIX_CTX953, 5022 .driver_data = SAA7134_BOARD_CREATIX_CTX953,
5023 }, {
5024 .vendor = PCI_VENDOR_ID_PHILIPS,
5025 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5026 .subvendor = 0x1462, /* MSI */
5027 .subdevice = 0x8625, /* TV@nywhere A/D v1.1 */
5028 .driver_data = SAA7134_BOARD_MSI_TVANYWHERE_AD11,
4993 },{ 5029 },{
4994 /* --- boards without eeprom + subsystem ID --- */ 5030 /* --- boards without eeprom + subsystem ID --- */
4995 .vendor = PCI_VENDOR_ID_PHILIPS, 5031 .vendor = PCI_VENDOR_ID_PHILIPS,
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 683a67561a6e..b55df4877aff 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1139,6 +1139,9 @@ static int dvb_init(struct saa7134_dev *dev)
1139 case SAA7134_BOARD_CREATIX_CTX953: 1139 case SAA7134_BOARD_CREATIX_CTX953:
1140 configure_tda827x_fe(dev, &md8800_dvbt_config); 1140 configure_tda827x_fe(dev, &md8800_dvbt_config);
1141 break; 1141 break;
1142 case SAA7134_BOARD_MSI_TVANYWHERE_AD11:
1143 configure_tda827x_fe(dev, &philips_tiger_s_config);
1144 break;
1142 default: 1145 default:
1143 wprintk("Huh? unknown DVB card?\n"); 1146 wprintk("Huh? unknown DVB card?\n");
1144 break; 1147 break;
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index e483209b6854..d7e0781fe8a1 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -256,6 +256,7 @@ struct saa7134_format {
256#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 256#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132
257#define SAA7134_BOARD_PHILIPS_SNAKE 133 257#define SAA7134_BOARD_PHILIPS_SNAKE 133
258#define SAA7134_BOARD_CREATIX_CTX953 134 258#define SAA7134_BOARD_CREATIX_CTX953 134
259#define SAA7134_BOARD_MSI_TVANYWHERE_AD11 135
259 260
260#define SAA7134_MAXBOARDS 8 261#define SAA7134_MAXBOARDS 8
261#define SAA7134_INPUT_MAX 8 262#define SAA7134_INPUT_MAX 8