aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2009-03-10 16:02:07 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:16 -0400
commite8944282a76f94bcf84ae3b7a91328bd03835ea1 (patch)
treed093b4a84c1e1a8e3fd8df65cad9f9235e0746ff
parent1d578540a949802eebe8655c7ef9566c85966e32 (diff)
V4L/DVB (10923): saa7134: fix typo in product name
replace occurances of "HVR1150" with "HVR1120" - this was a typo. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c20
-rw-r--r--drivers/media/video/saa7134/saa7134.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 325c69fe91fd..626820e519e3 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -153,5 +153,5 @@
153152 -> Asus Tiger Rev:1.00 [1043:4857] 153152 -> Asus Tiger Rev:1.00 [1043:4857]
154153 -> Kworld Plus TV Analog Lite PCI [17de:7128] 154153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
155154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d] 155154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
156155 -> Hauppauge WinTV-HVR1150 [0070:6706,0070:6708] 156155 -> Hauppauge WinTV-HVR1120 [0070:6706,0070:6708]
157156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a] 157156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 88f0b8f06e10..be53d8f35425 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3292,8 +3292,8 @@ struct saa7134_board saa7134_boards[] = {
3292 .gpio = 0x0200100, 3292 .gpio = 0x0200100,
3293 }, 3293 },
3294 }, 3294 },
3295 [SAA7134_BOARD_HAUPPAUGE_HVR1150] = { 3295 [SAA7134_BOARD_HAUPPAUGE_HVR1120] = {
3296 .name = "Hauppauge WinTV-HVR1150", 3296 .name = "Hauppauge WinTV-HVR1120",
3297 .audio_clock = 0x00187de7, 3297 .audio_clock = 0x00187de7,
3298 .tuner_type = TUNER_PHILIPS_TDA8290, 3298 .tuner_type = TUNER_PHILIPS_TDA8290,
3299 .radio_type = UNSET, 3299 .radio_type = UNSET,
@@ -5466,7 +5466,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
5466 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 5466 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5467 .subvendor = 0x0070, 5467 .subvendor = 0x0070,
5468 .subdevice = 0x6706, 5468 .subdevice = 0x6706,
5469 .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150, 5469 .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
5470 },{ 5470 },{
5471 .vendor = PCI_VENDOR_ID_PHILIPS, 5471 .vendor = PCI_VENDOR_ID_PHILIPS,
5472 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 5472 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -5478,7 +5478,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
5478 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 5478 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5479 .subvendor = 0x0070, 5479 .subvendor = 0x0070,
5480 .subdevice = 0x6708, 5480 .subdevice = 0x6708,
5481 .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150, 5481 .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
5482 },{ 5482 },{
5483 .vendor = PCI_VENDOR_ID_PHILIPS, 5483 .vendor = PCI_VENDOR_ID_PHILIPS,
5484 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 5484 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -5962,7 +5962,7 @@ static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
5962 switch (command) { 5962 switch (command) {
5963 case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */ 5963 case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */
5964 switch (dev->board) { 5964 switch (dev->board) {
5965 case SAA7134_BOARD_HAUPPAUGE_HVR1150: 5965 case SAA7134_BOARD_HAUPPAUGE_HVR1120:
5966 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: 5966 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
5967 ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg); 5967 ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);
5968 break; 5968 break;
@@ -5983,7 +5983,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
5983 int ret; 5983 int ret;
5984 5984
5985 switch (dev->board) { 5985 switch (dev->board) {
5986 case SAA7134_BOARD_HAUPPAUGE_HVR1150: 5986 case SAA7134_BOARD_HAUPPAUGE_HVR1120:
5987 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: 5987 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
5988 /* tda8290 + tda18271 */ 5988 /* tda8290 + tda18271 */
5989 ret = saa7134_tda8290_18271_callback(dev, command, arg); 5989 ret = saa7134_tda8290_18271_callback(dev, command, arg);
@@ -6026,7 +6026,7 @@ static void hauppauge_eeprom(struct saa7134_dev *dev, u8 *eeprom_data)
6026 switch (tv.model) { 6026 switch (tv.model) {
6027 case 67019: /* WinTV-HVR1110 (Retail, IR Blaster, hybrid, FM, SVid/Comp, 3.5mm audio in) */ 6027 case 67019: /* WinTV-HVR1110 (Retail, IR Blaster, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6028 case 67109: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */ 6028 case 67109: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
6029 case 67201: /* WinTV-HVR1150 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */ 6029 case 67201: /* WinTV-HVR1120 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6030 case 67301: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */ 6030 case 67301: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
6031 case 67209: /* WinTV-HVR1110 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */ 6031 case 67209: /* WinTV-HVR1110 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6032 case 67559: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */ 6032 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)
6034 case 67579: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM) */ 6034 case 67579: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM) */
6035 case 67589: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */ 6035 case 67589: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
6036 case 67599: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */ 6036 case 67599: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
6037 case 67651: /* WinTV-HVR1150 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */ 6037 case 67651: /* WinTV-HVR1120 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
6038 case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */ 6038 case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
6039 break; 6039 break;
6040 default: 6040 default:
@@ -6212,7 +6212,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
6212 6212
6213 saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00); 6213 saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);
6214 break; 6214 break;
6215 case SAA7134_BOARD_HAUPPAUGE_HVR1150: 6215 case SAA7134_BOARD_HAUPPAUGE_HVR1120:
6216 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: 6216 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6217 /* GPIO 26 high for digital, low for analog */ 6217 /* GPIO 26 high for digital, low for analog */
6218 saa7134_set_gpio(dev, 26, 0); 6218 saa7134_set_gpio(dev, 26, 0);
@@ -6474,7 +6474,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
6474 dev->name, saa7134_boards[dev->board].name); 6474 dev->name, saa7134_boards[dev->board].name);
6475 } 6475 }
6476 break; 6476 break;
6477 case SAA7134_BOARD_HAUPPAUGE_HVR1150: 6477 case SAA7134_BOARD_HAUPPAUGE_HVR1120:
6478 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: 6478 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6479 hauppauge_eeprom(dev, dev->eedata+0x80); 6479 hauppauge_eeprom(dev, dev->eedata+0x80);
6480 break; 6480 break;
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 52d9397ad779..f078de98ef57 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -278,7 +278,7 @@ struct saa7134_format {
278#define SAA7134_BOARD_ASUSTeK_TIGER 152 278#define SAA7134_BOARD_ASUSTeK_TIGER 152
279#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153 279#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
280#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154 280#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
281#define SAA7134_BOARD_HAUPPAUGE_HVR1150 155 281#define SAA7134_BOARD_HAUPPAUGE_HVR1120 155
282#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156 282#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
283 283
284#define SAA7134_MAXBOARDS 32 284#define SAA7134_MAXBOARDS 32