adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (12391): saa7134: Use correct product name for Hauppauge WinTV-HVR1120 DVB-T/Hybrid

Browse source 
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2009-08-03 16:51:33 -03:00 committed by Mauro Carvalho Chehab
parent b5f05064b5
commit 0e316ecfc8
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/video4linux/CARDLIST.saa7134
View file

@ -154,7 +154,7 @@
153 -> Kworld Plus TV Analog Lite PCI [17de:7128] 153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d] 154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708] 155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708]
156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a] 156 -> Hauppauge WinTV-HVR1120 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]
157 -> Avermedia AVerTV Studio 507UA [1461:a11b] 157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9] 158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
159 -> Beholder BeholdTV 505 RDS [0000:505B] 159 -> Beholder BeholdTV 505 RDS [0000:505B]

18
drivers/media/video/saa7134/saa7134-cards.c
View file

@ -3363,8 +3363,8 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x0800100, /* GPIO 23 HI for FM */ .gpio = 0x0800100, /* GPIO 23 HI for FM */
}, },
}, },
[SAA7134_BOARD_HAUPPAUGE_HVR1110R3] = { [SAA7134_BOARD_HAUPPAUGE_HVR1120] = {
.name = "Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid", .name = "Hauppauge WinTV-HVR1120 DVB-T/Hybrid",
.audio_clock = 0x00187de7, .audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290, .tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET, .radio_type = UNSET,
@ -5868,7 +5868,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x6707, .subdevice = 0x6707,
.driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110R3, .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
},{ },{
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@ -5880,13 +5880,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x6709, .subdevice = 0x6709,
.driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110R3, .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
},{ },{
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x670a, .subdevice = 0x670a,
.driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110R3, .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
},{ },{
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@ -6364,7 +6364,7 @@ static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */ case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */
switch (dev->board) { switch (dev->board) {
case SAA7134_BOARD_HAUPPAUGE_HVR1150: case SAA7134_BOARD_HAUPPAUGE_HVR1150:
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: case SAA7134_BOARD_HAUPPAUGE_HVR1120:
ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg); ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);
break; break;
default: default:
@ -6385,7 +6385,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
switch (dev->board) { switch (dev->board) {
case SAA7134_BOARD_HAUPPAUGE_HVR1150: case SAA7134_BOARD_HAUPPAUGE_HVR1150:
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: case SAA7134_BOARD_HAUPPAUGE_HVR1120:
/* tda8290 + tda18271 */ /* tda8290 + tda18271 */
ret = saa7134_tda8290_18271_callback(dev, command, arg); ret = saa7134_tda8290_18271_callback(dev, command, arg);
break; break;
@ -6626,7 +6626,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00); saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1150: case SAA7134_BOARD_HAUPPAUGE_HVR1150:
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: case SAA7134_BOARD_HAUPPAUGE_HVR1120:
/* GPIO 26 high for digital, low for analog */ /* GPIO 26 high for digital, low for analog */
saa7134_set_gpio(dev, 26, 0); saa7134_set_gpio(dev, 26, 0);
msleep(1); msleep(1);
@ -6892,7 +6892,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1150: case SAA7134_BOARD_HAUPPAUGE_HVR1150:
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: case SAA7134_BOARD_HAUPPAUGE_HVR1120:
hauppauge_eeprom(dev, dev->eedata+0x80); hauppauge_eeprom(dev, dev->eedata+0x80);
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110: case SAA7134_BOARD_HAUPPAUGE_HVR1110:

2
drivers/media/video/saa7134/saa7134-dvb.c
View file

@ -1119,7 +1119,7 @@ static int dvb_init(struct saa7134_dev *dev)
&tda827x_cfg_2) < 0) &tda827x_cfg_2) < 0)
goto dettach_frontend; goto dettach_frontend;
break; break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: case SAA7134_BOARD_HAUPPAUGE_HVR1120:
fe0->dvb.frontend = dvb_attach(tda10048_attach, fe0->dvb.frontend = dvb_attach(tda10048_attach,
&hcw_tda10048_config, &hcw_tda10048_config,
&dev->i2c_adap); &dev->i2c_adap);

2
drivers/media/video/saa7134/saa7134.h
View file

@ -279,7 +279,7 @@ struct saa7134_format {
#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153 #define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154 #define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
#define SAA7134_BOARD_HAUPPAUGE_HVR1150 155 #define SAA7134_BOARD_HAUPPAUGE_HVR1150 155
#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156 #define SAA7134_BOARD_HAUPPAUGE_HVR1120 156
#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157 #define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157
#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158 #define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158
#define SAA7134_BOARD_BEHOLD_505RDS 159 #define SAA7134_BOARD_BEHOLD_505RDS 159