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

Commit e3bfeabb authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411 



The newest variants of the HVR-1600 have an s5h1411/tda18271 for the digital
frontend.  Add support for these boards.

Thanks to Hauppauge Computer Works for providing sample hardware.

[awalls@md.metrocast.net: Changed an additional log message to clarify for
the end user that the driver is defaulting to an original HVR-1600 for
unknown model numbers.]

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d213ad08

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

+49 −1
Original line number Diff line number Diff line
@@ -95,6 +95,53 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { 
	.i2c = &cx18_i2c_std,

};



static const struct cx18_card cx18_card_hvr1600_s5h1411 = {

	.type = CX18_CARD_HVR_1600_S5H1411,

	.name = "Hauppauge HVR-1600",

	.comment = "Simultaneous Digital and Analog TV capture supported\n",

	.v4l2_capabilities = CX18_CAP_ENCODER,

	.hw_audio_ctrl = CX18_HW_418_AV,

	.hw_muxer = CX18_HW_CS5345,

	.hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER |

		  CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL |

		  CX18_HW_Z8F0811_IR_HAUP,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 },

		{ CX18_CARD_INPUT_SVIDEO2,    2, CX18_AV_SVIDEO2    },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE4 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX18_AV_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX18_AV_AUDIO_SERIAL1, CS5345_IN_2 },

		{ CX18_CARD_INPUT_LINE_IN2,

		  CX18_AV_AUDIO_SERIAL1, CS5345_IN_3 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX18_AV_AUDIO_SERIAL1, CS5345_IN_4 },

	.ddr = {

		/* ESMT M13S128324A-5B memory */

		.chip_config = 0x003,

		.refresh = 0x30c,

		.timing1 = 0x44220e82,

		.timing2 = 0x08,

		.tune_lane = 0,

		.initial_emrs = 0,

	},

	.gpio_init.initial_value = 0x3001,

	.gpio_init.direction = 0x3001,

	.gpio_i2c_slave_reset = {

		.active_lo_mask = 0x3001,

		.msecs_asserted = 10,

		.msecs_recovery = 40,

		.ir_reset_mask  = 0x0001,

	},

	.i2c = &cx18_i2c_std,

};



static const struct cx18_card cx18_card_hvr1600_samsung = {

	.type = CX18_CARD_HVR_1600_SAMSUNG,

	.name = "Hauppauge HVR-1600 (Preproduction)",
@@ -523,7 +570,8 @@ static const struct cx18_card *cx18_card_list[] = { 
	&cx18_card_toshiba_qosmio_dvbt,

	&cx18_card_leadtek_pvr2100,

	&cx18_card_leadtek_dvr3100h,

	&cx18_card_gotview_dvd3

	&cx18_card_gotview_dvd3,

	&cx18_card_hvr1600_s5h1411

};



const struct cx18_card *cx18_get_card(u16 index)

drivers/media/video/cx18/cx18-driver.c

+23 −2
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ MODULE_PARM_DESC(cardtype, 
		 "\t\t\t 7 = Leadtek WinFast PVR2100\n"

		 "\t\t\t 8 = Leadtek WinFast DVR3100 H\n"

		 "\t\t\t 9 = GoTView PCI DVD3 Hybrid\n"

		 "\t\t\t 10 = Hauppauge HVR 1600 (S5H1411)\n"

		 "\t\t\t 0 = Autodetect (default)\n"

		 "\t\t\t-1 = Ignore this card\n\t\t");

MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
@@ -337,6 +338,7 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv) 
	switch (cx->card->type) {

	case CX18_CARD_HVR_1600_ESMT:

	case CX18_CARD_HVR_1600_SAMSUNG:

	case CX18_CARD_HVR_1600_S5H1411:

		tveeprom_hauppauge_analog(&c, tv, eedata);

		break;

	case CX18_CARD_YUAN_MPC718:
@@ -365,7 +367,25 @@ static void cx18_process_eeprom(struct cx18 *cx) 
	   from the model number. Use the cardtype module option if you

	   have one of these preproduction models. */

	switch (tv.model) {

	case 74000 ... 74999:

	case 74301: /* Retail models */

	case 74321:

	case 74351: /* OEM models */

	case 74361:

		/* Digital side is s5h1411/tda18271 */

		cx->card = cx18_get_card(CX18_CARD_HVR_1600_S5H1411);

		break;

	case 74021: /* Retail models */

	case 74031:

	case 74041:

	case 74141:

	case 74541: /* OEM models */

	case 74551:

	case 74591:

	case 74651:

	case 74691:

	case 74751:

	case 74891:

		/* Digital side is s5h1409/mxl5005s */

		cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);

		break;

	case 0x718:
@@ -377,7 +397,8 @@ static void cx18_process_eeprom(struct cx18 *cx) 
		CX18_ERR("Invalid EEPROM\n");

		return;

	default:

		CX18_ERR("Unknown model %d, defaulting to HVR-1600\n", tv.model);

		CX18_ERR("Unknown model %d, defaulting to original HVR-1600 "

			 "(cardtype=1)\n", tv.model);

		cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);

		break;

	}

drivers/media/video/cx18/cx18-driver.h

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ 
#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */

#define CX18_CARD_LEADTEK_DVR3100H    7 /* Leadtek WinFast DVR3100 H */

#define CX18_CARD_GOTVIEW_PCI_DVD3    8 /* GoTView PCI DVD3 Hybrid */

#define CX18_CARD_LAST		      8

#define CX18_CARD_HVR_1600_S5H1411    9 /* Hauppauge HVR 1600 s5h1411/tda18271*/

#define CX18_CARD_LAST		      9



#define CX18_ENC_STREAM_TYPE_MPG  0

#define CX18_ENC_STREAM_TYPE_TS   1

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

+38 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include "cx18-gpio.h"

#include "s5h1409.h"

#include "mxl5005s.h"

#include "s5h1411.h"

#include "tda18271.h"

#include "zl10353.h"



#include <linux/firmware.h>
@@ -76,6 +78,32 @@ static struct s5h1409_config hauppauge_hvr1600_config = { 
	.hvr1600_opt   = S5H1409_HVR1600_OPTIMIZE

};



/*

 * CX18_CARD_HVR_1600_S5H1411

 */

static struct s5h1411_config hcw_s5h1411_config = {

	.output_mode   = S5H1411_SERIAL_OUTPUT,

	.gpio          = S5H1411_GPIO_OFF,

	.vsb_if        = S5H1411_IF_44000,

	.qam_if        = S5H1411_IF_4000,

	.inversion     = S5H1411_INVERSION_ON,

	.status_mode   = S5H1411_DEMODLOCKING,

	.mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,

};



static struct tda18271_std_map hauppauge_tda18271_std_map = {

	.atsc_6   = { .if_freq = 5380, .agc_mode = 3, .std = 3,

		      .if_lvl = 6, .rfagc_top = 0x37 },

	.qam_6    = { .if_freq = 4000, .agc_mode = 3, .std = 0,

		      .if_lvl = 6, .rfagc_top = 0x37 },

};



static struct tda18271_config hauppauge_tda18271_config = {

	.std_map = &hauppauge_tda18271_std_map,

	.gate    = TDA18271_GATE_DIGITAL,

	.output_opt = TDA18271_OUTPUT_LT_OFF,

};



/*

 * CX18_CARD_LEADTEK_DVR3100H

 */
@@ -244,6 +272,7 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed) 
	switch (cx->card->type) {

	case CX18_CARD_HVR_1600_ESMT:

	case CX18_CARD_HVR_1600_SAMSUNG:

	case CX18_CARD_HVR_1600_S5H1411:

		v = cx18_read_reg(cx, CX18_REG_DMUX_NUM_PORT_0_CONTROL);

		v |= 0x00400000; /* Serial Mode */

		v |= 0x00002000; /* Data Length - Byte */
@@ -455,6 +484,15 @@ static int dvb_register(struct cx18_stream *stream) 
			ret = 0;

		}

		break;

	case CX18_CARD_HVR_1600_S5H1411:

		dvb->fe = dvb_attach(s5h1411_attach,

				     &hcw_s5h1411_config,

				     &cx->i2c_adap[0]);

		if (dvb->fe != NULL)

			dvb_attach(tda18271_attach, dvb->fe,

				   0x60, &cx->i2c_adap[0],

				   &hauppauge_tda18271_config);

		break;

	case CX18_CARD_LEADTEK_DVR3100H:

		dvb->fe = dvb_attach(zl10353_attach,

				     &leadtek_dvr3100h_demod,