Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b5f05064b556da5183adc383e5f8d50af0392849

Authored by Michael Krufky
Committed by Mauro Carvalho Chehab
1 parent 79a6382551
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (12390): saa7134: Use correct product name for Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid 

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 4 changed files with 13 additions and 13 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.saa7134
Diff comments   View file @ b5f0506
... ... @@ -153,7 +153,7 @@
153 153 152 -> Asus Tiger Rev:1.00 [1043:4857]
154 154 153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
155 155 154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
156   -155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid [0070:6706,0070:6708]
  156 +155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708]
157 157 156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]
158 158 157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
159 159 158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
drivers/media/video/saa7134/saa7134-cards.c
Diff comments   View file @ b5f0506
... ... @@ -3331,8 +3331,8 @@
3331 3331 .gpio = 0x0200100,
3332 3332 },
3333 3333 },
3334   - [SAA7134_BOARD_HAUPPAUGE_HVR1120] = {
3335   - .name = "Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid",
  3334 + [SAA7134_BOARD_HAUPPAUGE_HVR1150] = {
  3335 + .name = "Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid",
3336 3336 .audio_clock = 0x00187de7,
3337 3337 .tuner_type = TUNER_PHILIPS_TDA8290,
3338 3338 .radio_type = UNSET,
... ... @@ -5862,7 +5862,7 @@
5862 5862 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5863 5863 .subvendor = 0x0070,
5864 5864 .subdevice = 0x6706,
5865   - .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
  5865 + .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150,
5866 5866 },{
5867 5867 .vendor = PCI_VENDOR_ID_PHILIPS,
5868 5868 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
... ... @@ -5874,7 +5874,7 @@
5874 5874 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5875 5875 .subvendor = 0x0070,
5876 5876 .subdevice = 0x6708,
5877   - .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1120,
  5877 + .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1150,
5878 5878 },{
5879 5879 .vendor = PCI_VENDOR_ID_PHILIPS,
5880 5880 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
... ... @@ -6363,7 +6363,7 @@
6363 6363 switch (command) {
6364 6364 case TDA18271_CALLBACK_CMD_AGC_ENABLE: /* 0 */
6365 6365 switch (dev->board) {
6366   - case SAA7134_BOARD_HAUPPAUGE_HVR1120:
  6366 + case SAA7134_BOARD_HAUPPAUGE_HVR1150:
6367 6367 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6368 6368 ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);
6369 6369 break;
... ... @@ -6384,7 +6384,7 @@
6384 6384 int ret;
6385 6385  
6386 6386 switch (dev->board) {
6387   - case SAA7134_BOARD_HAUPPAUGE_HVR1120:
  6387 + case SAA7134_BOARD_HAUPPAUGE_HVR1150:
6388 6388 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6389 6389 /* tda8290 + tda18271 */
6390 6390 ret = saa7134_tda8290_18271_callback(dev, command, arg);
... ... @@ -6427,7 +6427,7 @@
6427 6427 switch (tv.model) {
6428 6428 case 67019: /* WinTV-HVR1110 (Retail, IR Blaster, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6429 6429 case 67109: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
6430   - case 67201: /* WinTV-HVR1120 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
  6430 + case 67201: /* WinTV-HVR1150 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6431 6431 case 67301: /* WinTV-HVR1000 (Retail, IR Receive, analog, no FM, SVid/Comp, 3.5mm audio in) */
6432 6432 case 67209: /* WinTV-HVR1110 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */
6433 6433 case 67559: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
... ... @@ -6435,7 +6435,7 @@
6435 6435 case 67579: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM) */
6436 6436 case 67589: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
6437 6437 case 67599: /* WinTV-HVR1110 (OEM, no IR, hybrid, no FM, SVid/Comp, RCA aud) */
6438   - case 67651: /* WinTV-HVR1120 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
  6438 + case 67651: /* WinTV-HVR1150 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
6439 6439 case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */
6440 6440 break;
6441 6441 default:
... ... @@ -6625,7 +6625,7 @@
6625 6625  
6626 6626 saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);
6627 6627 break;
6628   - case SAA7134_BOARD_HAUPPAUGE_HVR1120:
  6628 + case SAA7134_BOARD_HAUPPAUGE_HVR1150:
6629 6629 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6630 6630 /* GPIO 26 high for digital, low for analog */
6631 6631 saa7134_set_gpio(dev, 26, 0);
... ... @@ -6891,7 +6891,7 @@
6891 6891 dev->name, saa7134_boards[dev->board].name);
6892 6892 }
6893 6893 break;
6894   - case SAA7134_BOARD_HAUPPAUGE_HVR1120:
  6894 + case SAA7134_BOARD_HAUPPAUGE_HVR1150:
6895 6895 case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:
6896 6896 hauppauge_eeprom(dev, dev->eedata+0x80);
6897 6897 break;
drivers/media/video/saa7134/saa7134-dvb.c
Diff comments   View file @ b5f0506
... ... @@ -1147,7 +1147,7 @@
1147 1147 &tda827x_cfg_1) < 0)
1148 1148 goto dettach_frontend;
1149 1149 break;
1150   - case SAA7134_BOARD_HAUPPAUGE_HVR1120:
  1150 + case SAA7134_BOARD_HAUPPAUGE_HVR1150:
1151 1151 fe0->dvb.frontend = dvb_attach(lgdt3305_attach,
1152 1152 &hcw_lgdt3305_config,
1153 1153 &dev->i2c_adap);
drivers/media/video/saa7134/saa7134.h
Diff comments   View file @ b5f0506
... ... @@ -278,7 +278,7 @@
278 278 #define SAA7134_BOARD_ASUSTeK_TIGER 152
279 279 #define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
280 280 #define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
281   -#define SAA7134_BOARD_HAUPPAUGE_HVR1120 155
  281 +#define SAA7134_BOARD_HAUPPAUGE_HVR1150 155
282 282 #define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
283 283 #define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157
284 284 #define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158