aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorPieter Palmers <pieterp@joow.be>2005-11-09 00:37:40 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:19 -0500
commitcf1c5d1d58793bb9320467226ffc850c75c20902 (patch)
tree9906502f4f8ff0517fc70eff392f1216f5112ca3 /drivers/media/video/saa7134
parent3ae1adc6ed93d55a27523f395284940fbe056401 (diff)
[PATCH] v4l: 796: add sknet monster tv mobile card
- Add SKNet Monster TV Mobile card. Signed-off-by: Pieter Palmers <pieterp@joow.be> 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')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c36
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
2 files changed, 35 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e6e50c0a80ce..17b0549f2e1b 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2368,6 +2368,29 @@ struct saa7134_board saa7134_boards[] = {
2368 .amux = LINE2, 2368 .amux = LINE2,
2369 }}, 2369 }},
2370 }, 2370 },
2371 [SAA7134_BOARD_MONSTERTV_MOBILE] = {
2372 .name = "SKNet MonsterTV Mobile",
2373 .audio_clock = 0x00187de7,
2374 .tuner_type = TUNER_PHILIPS_TDA8290,
2375 .radio_type = UNSET,
2376 .tuner_addr = ADDR_UNSET,
2377 .radio_addr = ADDR_UNSET,
2378
2379 .inputs = {{
2380 .name = name_tv,
2381 .vmux = 1,
2382 .amux = TV,
2383 .tv = 1,
2384 },{
2385 .name = name_comp1,
2386 .vmux = 3,
2387 .amux = LINE1,
2388 },{
2389 .name = name_svideo,
2390 .vmux = 6,
2391 .amux = LINE1,
2392 }},
2393 },
2371}; 2394};
2372 2395
2373const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 2396const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2773,13 +2796,19 @@ struct pci_device_id saa7134_pci_tbl[] = {
2773 .subvendor = 0x1435, 2796 .subvendor = 0x1435,
2774 .subdevice = 0x7330, 2797 .subdevice = 0x7330,
2775 .driver_data = SAA7134_BOARD_RTD_VFG7330, 2798 .driver_data = SAA7134_BOARD_RTD_VFG7330,
2776 },{ 2799 },{
2777 .vendor = PCI_VENDOR_ID_PHILIPS, 2800 .vendor = PCI_VENDOR_ID_PHILIPS,
2778 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2801 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2779 .subvendor = 0x1461, 2802 .subvendor = 0x1461,
2780 .subdevice = 0x1044, 2803 .subdevice = 0x1044,
2781 .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180, 2804 .driver_data = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180,
2782 },{ 2805 },{
2806 .vendor = PCI_VENDOR_ID_PHILIPS,
2807 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2808 .subvendor = 0x1131,
2809 .subdevice = 0x4ee9,
2810 .driver_data = SAA7134_BOARD_MONSTERTV_MOBILE,
2811 },{
2783 /* --- boards without eeprom + subsystem ID --- */ 2812 /* --- boards without eeprom + subsystem ID --- */
2784 .vendor = PCI_VENDOR_ID_PHILIPS, 2813 .vendor = PCI_VENDOR_ID_PHILIPS,
2785 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2814 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -2889,7 +2918,10 @@ int saa7134_board_init1(struct saa7134_dev *dev)
2889 /* power-up tuner chip */ 2918 /* power-up tuner chip */
2890 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000); 2919 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000);
2891 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000); 2920 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
2892 msleep(1); 2921 case SAA7134_BOARD_MONSTERTV_MOBILE:
2922 /* power-up tuner chip */
2923 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00040000, 0x00040000);
2924 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000004);
2893 break; 2925 break;
2894 case SAA7134_BOARD_FLYDVBTDUO: 2926 case SAA7134_BOARD_FLYDVBTDUO:
2895 case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS: 2927 case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS:
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 473c5dbb9b5f..99bbdcf727c3 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -202,6 +202,7 @@ struct saa7134_format {
202#define SAA7134_BOARD_RTD_VFG7330 73 202#define SAA7134_BOARD_RTD_VFG7330 73
203#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74 203#define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74
204#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75 204#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75
205#define SAA7134_BOARD_MONSTERTV_MOBILE 76
205 206
206#define SAA7134_MAXBOARDS 8 207#define SAA7134_MAXBOARDS 8
207#define SAA7134_INPUT_MAX 8 208#define SAA7134_INPUT_MAX 8