aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t-online.de>2006-10-06 18:13:50 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 05:50:49 -0500
commit587d2fd7f296dfb5ccf348e48d6d751bcc6a423a (patch)
tree772b22bfc09ce647f3e8c939765ae6ab93b22fd9 /drivers/media/video/saa7134/saa7134-cards.c
parent7343826370dd5fe14a2dcec20968f2d3a4431ce6 (diff)
V4L/DVB (4726): Add support for Pinnacle 310i
The driver supports analog TV, radio and DVB-T. It is based on the preliminary patch by Pierluigi Rolando. 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/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c41
1 files changed, 41 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 51f0cfdcb680..100cfc53dc98 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3022,6 +3022,39 @@ struct saa7134_board saa7134_boards[] = {
3022 .amux = LINE1, 3022 .amux = LINE1,
3023 }, 3023 },
3024 }, 3024 },
3025 [SAA7134_BOARD_PINNACLE_PCTV_310i] = {
3026 .name = "Pinnacle PCTV 310i",
3027 .audio_clock = 0x00187de7,
3028 .tuner_type = TUNER_PHILIPS_TDA8290,
3029 .radio_type = UNSET,
3030 .tuner_addr = ADDR_UNSET,
3031 .radio_addr = ADDR_UNSET,
3032 .mpeg = SAA7134_MPEG_DVB,
3033 .gpiomask = 0x000200000,
3034 .inputs = {{
3035 .name = name_tv,
3036 .vmux = 4,
3037 .amux = TV,
3038 .tv = 1,
3039 },{
3040 .name = name_comp1,
3041 .vmux = 1,
3042 .amux = LINE2,
3043 },{
3044 .name = name_comp2,
3045 .vmux = 0,
3046 .amux = LINE2,
3047 },{
3048 .name = name_svideo,
3049 .vmux = 8,
3050 .amux = LINE2,
3051 }},
3052 .radio = {
3053 .name = name_radio,
3054 .amux = TV,
3055 .gpio = 0x0200000,
3056 },
3057 },
3025}; 3058};
3026 3059
3027const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 3060const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3631,6 +3664,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3631 .subdevice = 0x4860, 3664 .subdevice = 0x4860,
3632 .driver_data = SAA7134_BOARD_ASUS_EUROPA2_HYBRID, 3665 .driver_data = SAA7134_BOARD_ASUS_EUROPA2_HYBRID,
3633 },{ 3666 },{
3667 .vendor = PCI_VENDOR_ID_PHILIPS,
3668 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3669 .subvendor = 0x11bd,
3670 .subdevice = 0x002f,
3671 .driver_data = SAA7134_BOARD_PINNACLE_PCTV_310i,
3672 },{
3634 /* --- boards without eeprom + subsystem ID --- */ 3673 /* --- boards without eeprom + subsystem ID --- */
3635 .vendor = PCI_VENDOR_ID_PHILIPS, 3674 .vendor = PCI_VENDOR_ID_PHILIPS,
3636 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 3675 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3793,6 +3832,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
3793 break; 3832 break;
3794 /* i2c remotes */ 3833 /* i2c remotes */
3795 case SAA7134_BOARD_PINNACLE_PCTV_110i: 3834 case SAA7134_BOARD_PINNACLE_PCTV_110i:
3835 case SAA7134_BOARD_PINNACLE_PCTV_310i:
3796 case SAA7134_BOARD_UPMOST_PURPLE_TV: 3836 case SAA7134_BOARD_UPMOST_PURPLE_TV:
3797 dev->has_remote = SAA7134_REMOTE_I2C; 3837 dev->has_remote = SAA7134_REMOTE_I2C;
3798 break; 3838 break;
@@ -3924,6 +3964,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
3924 } 3964 }
3925 break; 3965 break;
3926 case SAA7134_BOARD_PHILIPS_TIGER: 3966 case SAA7134_BOARD_PHILIPS_TIGER:
3967 case SAA7134_BOARD_PINNACLE_PCTV_310i:
3927 case SAA7134_BOARD_TEVION_DVBT_220RF: 3968 case SAA7134_BOARD_TEVION_DVBT_220RF:
3928 case SAA7134_BOARD_ASUSTeK_P7131_DUAL: 3969 case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
3929 case SAA7134_BOARD_MEDION_MD8800_QUADRO: 3970 case SAA7134_BOARD_MEDION_MD8800_QUADRO: