The patch number 10923 was added via Michael Krufky <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Michael Krufky <[email protected]>
saa7134: fix typo in product name
replace occurances of "HVR1150" with "HVR1120" - this was a typo.
Priority: normal
Signed-off-by: Michael Krufky <[email protected]>
---
linux/Documentation/video4linux/CARDLIST.saa7134 | 2 -
linux/drivers/media/video/saa7134/saa7134-cards.c | 20 +++++++-------
linux/drivers/media/video/saa7134/saa7134.h | 2 -
3 files changed, 12 insertions(+), 12 deletions(-)
diff -r 615fb8f01610 -r 27baef630b18
linux/Documentation/video4linux/CARDLIST.saa7134
--- a/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Mar 10 16:02:07
2009 -0400
@@ -153,5 +153,5 @@ 152 -> Asus Tiger Rev:1.00
152 -> Asus Tiger Rev:1.00 [1043:4857]
153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
-155 -> Hauppauge WinTV-HVR1150 [0070:6706,0070:6708]
+155 -> Hauppauge WinTV-HVR1120 [0070:6706,0070:6708]
156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a]
diff -r 615fb8f01610 -r 27baef630b18
linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Mar 10 16:02:07
2009 -0400
@@ -3331,8 +3331,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,
@@ -5505,7 +5505,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,
@@ -5517,7 +5517,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,
@@ -6057,7 +6057,7 @@ static int saa7134_tda8290_18271_callbac
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;
@@ -6078,7 +6078,7 @@ static int saa7134_tda8290_callback(stru
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);
@@ -6125,7 +6125,7 @@ static void hauppauge_eeprom(struct saa7
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) */
@@ -6133,7 +6133,7 @@ static void hauppauge_eeprom(struct saa7
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:
@@ -6315,7 +6315,7 @@ int saa7134_board_init1(struct saa7134_d
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);
@@ -6577,7 +6577,7 @@ int saa7134_board_init2(struct saa7134_d
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;
diff -r 615fb8f01610 -r 27baef630b18 linux/drivers/media/video/saa7134/saa7134.h
--- a/linux/drivers/media/video/saa7134/saa7134.h Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134.h Tue Mar 10 16:02:07
2009 -0400
@@ -279,7 +279,7 @@ struct saa7134_format {
#define SAA7134_BOARD_ASUSTeK_TIGER 152
#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
-#define SAA7134_BOARD_HAUPPAUGE_HVR1150 155
+#define SAA7134_BOARD_HAUPPAUGE_HVR1120 155
#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
#define SAA7134_MAXBOARDS 32
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/27baef630b181a6d2812d7a67b391e03ee01f9d2
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
