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

Commit a77743bc authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6168): cx23885: Added HVR1250 ATSC support 



Adding support for the Hauppauge HVR1250 PCIe ATSC board.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4823e9ee

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

+26 −0
Original line number Diff line number Diff line
@@ -88,6 +88,27 @@ struct cx23885_board cx23885_boards[] = { 
			.gpio0  = 0xff02,

		}},

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1250] = {

		.name		= "Hauppauge WinTV-HVR1250",

		.portc		= CX23885_MPEG_DVB,

		.input          = {{

			.type   = CX23885_VMUX_TELEVISION,

			.vmux   = 0,

			.gpio0  = 0xff00,

		},{

			.type   = CX23885_VMUX_DEBUG,

			.vmux   = 0,

			.gpio0  = 0xff01,

		},{

			.type   = CX23885_VMUX_COMPOSITE1,

			.vmux   = 1,

			.gpio0  = 0xff02,

		},{

			.type   = CX23885_VMUX_SVIDEO,

			.vmux   = 2,

			.gpio0  = 0xff02,

		}},

	},

};

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

		.subdevice = 0x7801,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1800,

	},{

		.subvendor = 0x0070,

		.subdevice = 0x7911,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1250,

	},

};

const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -176,6 +201,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	}



	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

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

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

+7 −0
Original line number Diff line number Diff line
@@ -603,6 +603,11 @@ void cx23885_reset(struct cx23885_dev *dev) 
	cx23885_sram_channel_setup(dev, &dev->sram_channels[ SRAM_CH09 ], 128, 0);



	switch(dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

		/* GPIO-0 cx24227 demodulator reset */

		dprintk( 1, "%s() Configuring HVR1250 GPIO's\n", __FUNCTION__);

		cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

		/* GPIO-0 656_CLK */

		/* GPIO-1 656_D0 */
@@ -650,6 +655,7 @@ static int cx23885_ir_init(struct cx23885_dev *dev) 
	dprintk(1, "%s()\n", __FUNCTION__);



	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

		dprintk(1, "%s() FIXME - Implement IR support\n", __FUNCTION__);

		break;
@@ -1023,6 +1029,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port, 
	cx_write(GPIO2, 0x00);



	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

		cx_write(port->reg_vld_misc, 0x00);

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

+24 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ static struct s5h1409_config hauppauge_hvr1800_config = { 
	.status_mode   = S5H1409_DEMODLOCKING

};



static struct s5h1409_config hauppauge_hvr1250_config = {

	.demod_address = 0x32 >> 1,

	.output_mode   = S5H1409_SERIAL_OUTPUT,

	.gpio          = S5H1409_GPIO_ON,

	.if_freq       = 44000,

	.inversion     = S5H1409_INVERSION_OFF,

	.status_mode   = S5H1409_DEMODLOCKING

};







static struct mt2131_config hauppauge_hvr1800lp_rev2_tunerconfig = {

	0x61
@@ -106,6 +116,10 @@ static struct mt2131_config hauppauge_hvr1800_tunerconfig = { 
	0x61

};



static struct mt2131_config hauppauge_hvr1250_tunerconfig = {

	0x61

};



static int dvb_register(struct cx23885_tsport *port)

{

	struct cx23885_dev *dev = port->dev;
@@ -115,6 +129,16 @@ static int dvb_register(struct cx23885_tsport *port) 


	/* init frontend */

	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

		port->dvb.frontend = dvb_attach(s5h1409_attach,

						&hauppauge_hvr1250_config,

						&dev->i2c_bus[0].i2c_adap);

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

			dvb_attach(mt2131_attach, port->dvb.frontend,

				   &dev->i2c_bus[0].i2c_adap,

				   &hauppauge_hvr1250_tunerconfig, 0);

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

		port->dvb.frontend = dvb_attach(s5h1409_attach,

						&hauppauge_hvr1800lp_config,

drivers/media/video/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define CX23885_BOARD_UNKNOWN                  0

#define CX23885_BOARD_HAUPPAUGE_HVR1800lp      1

#define CX23885_BOARD_HAUPPAUGE_HVR1800        2

#define CX23885_BOARD_HAUPPAUGE_HVR1250        3



enum cx23885_itype {

	CX23885_VMUX_COMPOSITE1 = 1,