Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5f05064 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarMichael Krufky <mkrufky@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 79a63825

Documentation/video4linux/CARDLIST.saa7134

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
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-HVR1120 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]

157 -> Avermedia AVerTV Studio 507UA            [1461:a11b]

158 -> AVerMedia Cardbus TV/Radio (E501R)       [1461:b7e9]

drivers/media/video/saa7134/saa7134-cards.c

+10 −10
Original line number Diff line number Diff line
@@ -3331,8 +3331,8 @@ struct saa7134_board saa7134_boards[] = { 
			.gpio = 0x0200100,

		},

	},

	[SAA7134_BOARD_HAUPPAUGE_HVR1120] = {

		.name           = "Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid",

	[SAA7134_BOARD_HAUPPAUGE_HVR1150] = {

		.name           = "Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,
@@ -5862,7 +5862,7 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6706,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1120,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1150,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -5874,7 +5874,7 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6708,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1120,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1150,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -6363,7 +6363,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_HVR1120:

		case SAA7134_BOARD_HAUPPAUGE_HVR1150:

		case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:

			ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);

			break;
@@ -6384,7 +6384,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev, 
	int ret;



	switch (dev->board) {

	case SAA7134_BOARD_HAUPPAUGE_HVR1120:

	case SAA7134_BOARD_HAUPPAUGE_HVR1150:

	case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:

		/* tda8290 + tda18271 */

		ret = saa7134_tda8290_18271_callback(dev, command, arg);
@@ -6427,7 +6427,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-HVR1120 (Retail, IR Receive, hybrid, FM, SVid/Comp, 3.5mm audio in) */

	case 67201: /* WinTV-HVR1150 (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) */
@@ -6435,7 +6435,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-HVR1120 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */

	case 67651: /* WinTV-HVR1150 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */

	case 67659: /* WinTV-HVR1110 (OEM, no IR, hybrid, FM, SVid/Comp, RCA aud) */

		break;

	default:
@@ -6625,7 +6625,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) 


		saa_writeb (SAA7134_PRODUCTION_TEST_MODE, 0x00);

		break;

	case SAA7134_BOARD_HAUPPAUGE_HVR1120:

	case SAA7134_BOARD_HAUPPAUGE_HVR1150:

	case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:

		/* GPIO 26 high for digital, low for analog */

		saa7134_set_gpio(dev, 26, 0);
@@ -6891,7 +6891,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		       dev->name, saa7134_boards[dev->board].name);

	       }

	       break;

	case SAA7134_BOARD_HAUPPAUGE_HVR1120:

	case SAA7134_BOARD_HAUPPAUGE_HVR1150:

	case SAA7134_BOARD_HAUPPAUGE_HVR1110R3:

		hauppauge_eeprom(dev, dev->eedata+0x80);

		break;

drivers/media/video/saa7134/saa7134-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ static int dvb_init(struct saa7134_dev *dev) 
					 &tda827x_cfg_1) < 0)

			goto dettach_frontend;

		break;

	case SAA7134_BOARD_HAUPPAUGE_HVR1120:

	case SAA7134_BOARD_HAUPPAUGE_HVR1150:

		fe0->dvb.frontend = dvb_attach(lgdt3305_attach,

					       &hcw_lgdt3305_config,

					       &dev->i2c_adap);

drivers/media/video/saa7134/saa7134.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,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_HVR1120     155

#define SAA7134_BOARD_HAUPPAUGE_HVR1150     155

#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3   156

#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157

#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158