|
@@ -3292,8 +3292,8 @@ struct saa7134_board saa7134_boards[] = {
|
|
|
.gpio = 0x0200100,
|
|
|
},
|
|
|
},
|
|
|
- [SAA7134_BOARD_HAUPPAUGE_HVR1150] = {
|
|
|
- .name = "Hauppauge WinTV-HVR1150",
|
|
|
+ [SAA7134_BOARD_HAUPPAUGE_HVR1120] = {
|
|
|
+ .name = "Hauppauge WinTV-HVR1120",
|
|
|
.audio_clock = 0x00187de7,
|
|
|
.tuner_type = TUNER_PHILIPS_TDA8290,
|
|
|
.radio_type = UNSET,
|
|
@@ -5466,7 +5466,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
|
|
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
|
|
|
.subvendor = 0x0070,
|
|
|
.subdevice = 0x6706,
|
|
|
- .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150,
|
|
|
+ .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
|
|
|
},{
|
|
|
.vendor = PCI_VENDOR_ID_PHILIPS,
|
|
|
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
|
|
@@ -5478,7 +5478,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
|
|
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
|
|
|
.subvendor = 0x0070,
|
|
|
.subdevice = 0x6708,
|
|
|
- .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150,
|
|
|
+ .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
|
|
|
},{
|
|
|
.vendor = PCI_VENDOR_ID_PHILIPS,
|
|
|
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
|
|
@@ -5962,7 +5962,7 @@ static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
|
|
|
switch (command) {
|
|
|
case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */
|
|
|
switch (dev->board) {
|
|
|
- case SAA7134_BOARD_HAUPPAUGE_HVR1150:
|
|
|
+ case SAA7134_BOARD_HAUPPAUGE_HVR1120:
|
|
|
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
|
|
|
ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);
|
|
|
break;
|
|
@@ -5983,7 +5983,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
|
|
|
int ret;
|
|
|
|
|
|
switch (dev->board) {
|
|
|
- case SAA7134_BOARD_HAUPPAUGE_HVR1150:
|
|
|
+ case SAA7134_BOARD_HAUPPAUGE_HVR1120:
|
|
|
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
|
|
|
/* tda8290 + tda18271 */
|
|
|
ret = saa7134_tda8290_18271_callback(dev, command, arg);
|
|
@@ -6026,7 +6026,7 @@ static void hauppauge_eeprom(struct saa7134_dev *dev, u8 *eeprom_data)
|
|
|
switch (tv.model) {
|
|
|
case 67019: /* WinTV-HVR1110 (Retail, IR Blaster, hybrid, FM, SVid/Comp, 3.5mm audio in) */
|
|
|
case 67109: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
|
|
|
- case 67201: /* WinTV-HVR1150 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
|
|
|
+ case 67201: /* WinTV-HVR1120 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
|
|
|
case 67301: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
|
|
|
case 67209: /* WinTV-HVR1110 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
|
|
|
case 67559: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
|
|
@@ -6034,7 +6034,7 @@ static void hauppauge_eeprom(struct saa7134_dev *dev, u8 *eeprom_data)
|
|
|
case 67579: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM) */
|
|
|
case 67589: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
|
|
|
case 67599: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
|
|
|
- case 67651: /* WinTV-HVR1150 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
|
|
|
+ case 67651: /* WinTV-HVR1120 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
|
|
|
case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
|
|
|
break;
|
|
|
default:
|
|
@@ -6212,7 +6212,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
|
|
|
|
|
|
saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);
|
|
|
break;
|
|
|
- case SAA7134_BOARD_HAUPPAUGE_HVR1150:
|
|
|
+ case SAA7134_BOARD_HAUPPAUGE_HVR1120:
|
|
|
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
|
|
|
/* GPIO 26 high for digital, low for analog */
|
|
|
saa7134_set_gpio(dev, 26, 0);
|
|
@@ -6474,7 +6474,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
|
|
|
dev->name, saa7134_boards[dev->board].name);
|
|
|
}
|
|
|
break;
|
|
|
- case SAA7134_BOARD_HAUPPAUGE_HVR1150:
|
|
|
+ case SAA7134_BOARD_HAUPPAUGE_HVR1120:
|
|
|
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
|
|
|
hauppauge_eeprom(dev, dev->eedata+0x80);
|
|
|
break;
|