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

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

V4L/DVB (11770): cx23885: add ATSC/QAM tuning support for Hauppauge WinTV-HVR1255 



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

Documentation/video4linux/CARDLIST.cx23885

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ 
 17 -> NetUP Dual DVB-S2 CI                                [1b55:2a2c]

 18 -> Hauppauge WinTV-HVR1270                             [0070:2211]

 19 -> Hauppauge WinTV-HVR1275                             [0070:2215]

 20 -> Hauppauge WinTV-HVR1255                             [0070:2251]

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

+12 −0
Original line number Diff line number Diff line
@@ -189,6 +189,10 @@ struct cx23885_board cx23885_boards[] = { 
		.name		= "Hauppauge WinTV-HVR1275",

		.portc		= CX23885_MPEG_DVB,

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1255] = {

		.name		= "Hauppauge WinTV-HVR1255",

		.portc		= CX23885_MPEG_DVB,

	},

};

const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
@@ -296,6 +300,10 @@ struct cx23885_subid cx23885_subids[] = { 
		.subvendor = 0x0070,

		.subdevice = 0x2215,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1275,

	}, {

		.subvendor = 0x0070,

		.subdevice = 0x2251,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1255,

	},

};

const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -637,6 +645,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) 
		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

		/* GPIO-5 RF Control: 0 = RF1 Terrestrial, 1 = RF2 Cable */

		/* GPIO-6 I2C Gate which can isolate the 3305 from the bus */

		/* GPIO-9 LG3305 reset */
@@ -662,6 +671,7 @@ int cx23885_ir_init(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1400:

	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

		/* FIXME: Implement me */

		break;

	case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
@@ -699,6 +709,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1700:

	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

		if (dev->i2c_bus[0].i2c_rc == 0)

			hauppauge_eeprom(dev, eeprom+0xc0);

		break;
@@ -758,6 +769,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:

	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	default:

		ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */

		ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */

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

+21 −0
Original line number Diff line number Diff line
@@ -197,6 +197,16 @@ static struct s5h1411_config dvico_s5h1411_config = { 
	.mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,

};



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 xc5000_config hauppauge_hvr1500q_tunerconfig = {

	.i2c_address      = 0x61,

	.if_khz           = 5380,
@@ -433,6 +443,17 @@ static int dvb_register(struct cx23885_tsport *port) 
				   &hcw_lgdt3305_tda18271_config);

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

		i2c_bus = &dev->i2c_bus[0];

		fe0->dvb.frontend = dvb_attach(s5h1411_attach,

					       &hcw_s5h1411_config,

					       &i2c_bus->i2c_adap);

		if (fe0->dvb.frontend != NULL) {

			dvb_attach(tda18271_attach, fe0->dvb.frontend,

				   0x60, &dev->i2c_bus[1].i2c_adap,

				   &hauppauge_tda18271_config);

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

		i2c_bus = &dev->i2c_bus[0];

		switch (alt_tuner) {

drivers/media/video/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define CX23885_BOARD_NETUP_DUAL_DVBS2_CI      17

#define CX23885_BOARD_HAUPPAUGE_HVR1270        18

#define CX23885_BOARD_HAUPPAUGE_HVR1275        19

#define CX23885_BOARD_HAUPPAUGE_HVR1255        20



#define GPIO_0 0x00000001

#define GPIO_1 0x00000002