aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2005-11-09 00:36:22 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:07 -0500
commit6b96144026e27b9250713f86355e83095204d5f2 (patch)
treebddf687c9eb864aef2c86782eddf7d5e70c2c14f /drivers/media/video/saa7134/saa7134-cards.c
parent7c08fb02f1a1b86292aa144cc876a95fbe2a5606 (diff)
[PATCH] v4l: 639: added new card gotview pci 7135
- Added new card GoTView PCI 7135 Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c53
1 files changed, 52 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index bca5b7038a8c..088376d3c95b 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2141,6 +2141,50 @@ struct saa7134_board saa7134_boards[] = {
2141 .amux = LINE2, 2141 .amux = LINE2,
2142 }, 2142 },
2143 }, 2143 },
2144 [SAA7134_BOARD_GOTVIEW_7135] = {
2145 /* Mike Baikov <lists@baikov.com> */
2146 /* Andrey Cvetcov <ays14@yandex.ru> */
2147 .name = "GoTView 7135 PCI",
2148 .audio_clock = 0x00187de7,
2149 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
2150 .radio_type = UNSET,
2151 .tuner_addr = ADDR_UNSET,
2152 .radio_addr = ADDR_UNSET,
2153 .tda9887_conf = TDA9887_PRESENT,
2154 .gpiomask = 0x00200003,
2155 .inputs = {{
2156 .name = name_tv,
2157 .vmux = 1,
2158 .amux = TV,
2159 .tv = 1,
2160 .gpio = 0x00200003,
2161 },{
2162 .name = name_tv_mono,
2163 .vmux = 1,
2164 .amux = LINE2,
2165 .gpio = 0x00200003,
2166 },{
2167 .name = name_comp1,
2168 .vmux = 3,
2169 .amux = LINE1,
2170 .gpio = 0x00200003,
2171 },{
2172 .name = name_svideo,
2173 .vmux = 8,
2174 .amux = LINE1,
2175 .gpio = 0x00200003,
2176 }},
2177 .radio = {
2178 .name = name_radio,
2179 .amux = LINE2,
2180 .gpio = 0x00200003,
2181 },
2182 .mute = {
2183 .name = name_mute,
2184 .amux = TV,
2185 .gpio = 0x00200003,
2186 },
2187 },
2144}; 2188};
2145 2189
2146const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 2190const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2505,6 +2549,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
2505 .subdevice = 0x4091, 2549 .subdevice = 0x4091,
2506 .driver_data = SAA7134_BOARD_BEHOLD_409FM, 2550 .driver_data = SAA7134_BOARD_BEHOLD_409FM,
2507 },{ 2551 },{
2552 .vendor = PCI_VENDOR_ID_PHILIPS,
2553 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2554 .subvendor = 0x5456, /* GoTView */
2555 .subdevice = 0x7135,
2556 .driver_data = SAA7134_BOARD_GOTVIEW_7135,
2557 },{
2508 /* --- boards without eeprom + subsystem ID --- */ 2558 /* --- boards without eeprom + subsystem ID --- */
2509 .vendor = PCI_VENDOR_ID_PHILIPS, 2559 .vendor = PCI_VENDOR_ID_PHILIPS,
2510 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2560 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -2597,6 +2647,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
2597 case SAA7134_BOARD_MANLI_MTV002: 2647 case SAA7134_BOARD_MANLI_MTV002:
2598 case SAA7134_BOARD_BEHOLD_409FM: 2648 case SAA7134_BOARD_BEHOLD_409FM:
2599 case SAA7134_BOARD_AVACSSMARTTV: 2649 case SAA7134_BOARD_AVACSSMARTTV:
2650 case SAA7134_BOARD_GOTVIEW_7135:
2600 dev->has_remote = 1; 2651 dev->has_remote = 1;
2601 break; 2652 break;
2602 case SAA7134_BOARD_MD5044: 2653 case SAA7134_BOARD_MD5044:
@@ -2613,7 +2664,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
2613 break; 2664 break;
2614 case SAA7134_BOARD_FLYDVBTDUO: 2665 case SAA7134_BOARD_FLYDVBTDUO:
2615 case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS: 2666 case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS:
2616 /* turn the fan on Hac: static for the time being */ 2667 /* turn the fan on */
2617 saa_writeb(SAA7134_GPIO_GPMODE3, 0x08); 2668 saa_writeb(SAA7134_GPIO_GPMODE3, 0x08);
2618 saa_writeb(SAA7134_GPIO_GPSTATUS3, 0x06); 2669 saa_writeb(SAA7134_GPIO_GPSTATUS3, 0x06);
2619 break; 2670 break;