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

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

V4L/DVB (13347): cx23885: add digital television support for Hauppauge WinTV-HVR1290 



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

Documentation/video4linux/CARDLIST.cx23885

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ 
 23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]

 24 -> Hauppauge WinTV-HVR1850                             [0070:8541]

 25 -> Compro VideoMate E800                               [1858:e800]

 26 -> Hauppauge WinTV-HVR1290                             [0070:8551]

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

+12 −0
Original line number Diff line number Diff line
@@ -265,6 +265,10 @@ struct cx23885_board cx23885_boards[] = { 
		.name		= "Compro VideoMate E800",

		.portc		= CX23885_MPEG_DVB,

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1290] = {

		.name		= "Hauppauge WinTV-HVR1290",

		.portc		= CX23885_MPEG_DVB,

	},

};

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

		.subdevice = 0xe800,

		.card      = CX23885_BOARD_COMPRO_VIDEOMATE_E800,

	}, {

		.subvendor = 0x0070,

		.subdevice = 0x8551,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1290,

	},

};

const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -819,6 +827,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) 
		mdelay(100);

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

		/* GPIO-0 656_CLK */

		/* GPIO-1 656_D0 */

		/* GPIO-2 Wake# */
@@ -934,6 +943,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1210:

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

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

			hauppauge_eeprom(dev, eeprom+0xc0);

		break;
@@ -1003,6 +1013,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1210:

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_COMPRO_VIDEOMATE_E800:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

	default:

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

		ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -1023,6 +1034,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_MYGICA_X8506:

	case CX23885_BOARD_MAGICPRO_PROHDTVE2:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

		dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,

				&dev->i2c_bus[2].i2c_adap,

				"cx25840", "cx25840", 0x88 >> 1, NULL);

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

+1 −0
Original line number Diff line number Diff line
@@ -898,6 +898,7 @@ static int dvb_register(struct cx23885_tsport *port) 
		}

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

		i2c_bus = &dev->i2c_bus[0];

		fe0->dvb.frontend = dvb_attach(s5h1411_attach,

			&hcw_s5h1411_config,

drivers/media/video/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
#define CX23885_BOARD_MAGICPRO_PROHDTVE2       23

#define CX23885_BOARD_HAUPPAUGE_HVR1850        24

#define CX23885_BOARD_COMPRO_VIDEOMATE_E800    25

#define CX23885_BOARD_HAUPPAUGE_HVR1290        26



#define GPIO_0 0x00000001

#define GPIO_1 0x00000002