aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorThomas Genty <tomlohave@gmail.com>2006-11-05 12:17:30 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 05:51:16 -0500
commitc6e53daffc2c6e66069304b3970256744074abec (patch)
tree5744088c00dc008ac7765fd78b511b812461a39b /drivers/media/video/saa7134/saa7134-cards.c
parent8637a8759585b97ec1d54ff4a4f33f34be4f5b1c (diff)
V4L/DVB (4806): Saa7134: add support for Hauppauge WinTV-HVR1110 DVB-T/Hybrid
This patch adds support for the Hauppauge WinTV-HVR1110 DVB-T/Hybrid Signed-off-by: Thomas Genty <tomlohave@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> 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.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index f5ad450dd7c..d8d8142d921 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3126,6 +3126,28 @@ struct saa7134_board saa7134_boards[] = {
3126 .amux = LINE2, 3126 .amux = LINE2,
3127 }}, 3127 }},
3128 }, 3128 },
3129 [SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
3130 /* Thomas Genty <tomlohave@gmail.com> */
3131 .name = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
3132 .audio_clock = 0x00187de7,
3133 .tuner_type = TUNER_PHILIPS_TDA8290,
3134 .radio_type = UNSET,
3135 .tuner_addr = ADDR_UNSET,
3136 .radio_addr = ADDR_UNSET,
3137 .mpeg = SAA7134_MPEG_DVB,
3138 .gpiomask = 0x000200000,
3139 .inputs = {{
3140 .name = name_tv,
3141 .vmux = 1,
3142 .amux = TV,
3143 .tv = 1,
3144 }},
3145 .radio = {
3146 .name = name_radio,
3147 .amux = TV,
3148 .gpio = 0x0200000,
3149 },
3150 },
3129}; 3151};
3130 3152
3131const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); 3153const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3753,6 +3775,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
3753 .subdevice = 0x4876, 3775 .subdevice = 0x4876,
3754 .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL, 3776 .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
3755 },{ 3777 },{
3778 .vendor = PCI_VENDOR_ID_PHILIPS,
3779 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
3780 .subvendor = 0x0070,
3781 .subdevice = 0x6701,
3782 .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110,
3783 },{
3756 /* --- boards without eeprom + subsystem ID --- */ 3784 /* --- boards without eeprom + subsystem ID --- */
3757 .vendor = PCI_VENDOR_ID_PHILIPS, 3785 .vendor = PCI_VENDOR_ID_PHILIPS,
3758 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 3786 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4053,6 +4081,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
4053 case SAA7134_BOARD_TEVION_DVBT_220RF: 4081 case SAA7134_BOARD_TEVION_DVBT_220RF:
4054 case SAA7134_BOARD_ASUSTeK_P7131_DUAL: 4082 case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
4055 case SAA7134_BOARD_MEDION_MD8800_QUADRO: 4083 case SAA7134_BOARD_MEDION_MD8800_QUADRO:
4084 case SAA7134_BOARD_HAUPPAUGE_HVR1110:
4056 /* this is a hybrid board, initialize to analog mode 4085 /* this is a hybrid board, initialize to analog mode
4057 * and configure firmware eeprom address 4086 * and configure firmware eeprom address
4058 */ 4087 */