V4L/DVB (6885): Add support for the Hauppauge HVR1500Q (d1987d55) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/video4linux/CARDLIST.cx23885

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@
		2 -> Hauppauge WinTV-HVR1800 [0070:7800,0070:7801]
		3 -> Hauppauge WinTV-HVR1250 [0070:7911]
		4 -> DViCO FusionHDTV5 Express [18ac:d500]
		5 -> Hauppauge WinTV-HVR1500Q [0070:7797]

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,11 @@ struct cx23885_board cx23885_boards[] = {
		.name = "DViCO FusionHDTV5 Express",
		.portb = CX23885_MPEG_DVB,
		},
		[CX23885_BOARD_HAUPPAUGE_HVR1500Q] = {
		.name = "Hauppauge WinTV-HVR1500Q",
		.portc = CX23885_MPEG_DVB,
		},

		};
		const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);

		@@ -144,6 +149,10 @@ struct cx23885_subid cx23885_subids[] = {
		.subvendor = 0x18ac,
		.subdevice = 0xd500,
		.card = CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,
		},{
		.subvendor = 0x0070,
		.subdevice = 0x7797,
		.card = CX23885_BOARD_HAUPPAUGE_HVR1500Q,
		},
		};
		const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
		@@ -204,6 +213,11 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
		/* GPIO-0 cx24227 demodulator reset */
		cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
		break;
		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
		/* GPIO-0 cx24227 demodulator reset */
		/* GPIO-2 xc5000 tuner reset */
		cx_set(GP0_IO, 0x00050005); /* Bring the part out of reset */
		break;
		case CX23885_BOARD_HAUPPAUGE_HVR1800:
		/* GPIO-0 656_CLK */
		/* GPIO-1 656_D0 */
		@@ -221,6 +235,7 @@ int cx23885_ir_init(struct cx23885_dev *dev)
		{
		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1250:
		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
		case CX23885_BOARD_HAUPPAUGE_HVR1800:
		/* FIXME: Implement me */
		break;
		@@ -244,6 +259,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)

		switch (dev->board) {
		case CX23885_BOARD_HAUPPAUGE_HVR1250:
		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
		case CX23885_BOARD_HAUPPAUGE_HVR1800:
		case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
		if (dev->i2c_bus[0].i2c_rc == 0)
		@@ -258,6 +274,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
		ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
		break;
		case CX23885_BOARD_HAUPPAUGE_HVR1250:
		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
		case CX23885_BOARD_HAUPPAUGE_HVR1800:
		case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
		default:

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

+54 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include "s5h1409.h"
		#include "mt2131.h"
		#include "lgdt330x.h"
		#include "xc5000.h"
		#include "dvb-pll.h"

		static unsigned int debug = 0;
		@@ -74,6 +75,32 @@ static void dvb_buf_release(struct videobuf_queue *q,
		cx23885_free_buffer(q, (struct cx23885_buffer*)vb);
		}

		static int cx23885_request_firmware(struct dvb_frontend *fe,
		const struct firmware *fw, char name)
		{
		struct cx23885_tsport *port = fe->dvb->priv;
		struct cx23885_dev *dev = port->dev;

		dprintk(1, "%s(?,?,%s)\n", __FUNCTION__, name);

		return request_firmware(fw, name, &dev->pci->dev);
		}

		static int hauppauge_hvr1500q_tuner_reset(struct dvb_frontend *fe)
		{
		struct cx23885_tsport *port = fe->dvb->priv;
		struct cx23885_dev *dev = port->dev;

		dprintk(1, "%s()\n", __FUNCTION__);

		/* Drive the tuner into reset back back */
		cx_clear(GP0_IO, 0x00000004);
		mdelay(200);
		cx_set(GP0_IO, 0x00000004);

		return 0;
		}

		static struct videobuf_queue_ops dvb_qops = {
		.buf_setup = dvb_buf_setup,
		.buf_prepare = dvb_buf_prepare,
		@@ -109,6 +136,22 @@ static struct lgdt330x_config fusionhdtv_5_express = {
		.serial_mpeg = 0x40,
		};

		static struct s5h1409_config hauppauge_hvr1500q_config = {
		.demod_address = 0x32 >> 1,
		.output_mode = S5H1409_SERIAL_OUTPUT,
		.gpio = S5H1409_GPIO_ON,
		.qam_if = 44000,
		.inversion = S5H1409_INVERSION_OFF,
		.status_mode = S5H1409_DEMODLOCKING
		};

		static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
		.i2c_address = 0x61,
		.if_frequency = 4570000,
		.request_firmware = cx23885_request_firmware,
		.tuner_reset = hauppauge_hvr1500q_tuner_reset
		};

		static int dvb_register(struct cx23885_tsport *port)
		{
		struct cx23885_dev *dev = port->dev;
		@@ -152,6 +195,17 @@ static int dvb_register(struct cx23885_tsport *port)
		&i2c_bus->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
		}
		break;
		case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
		i2c_bus = &dev->i2c_bus[1];
		port->dvb.frontend = dvb_attach(s5h1409_attach,
		&hauppauge_hvr1500q_config,
		&dev->i2c_bus[0].i2c_adap);
		if (port->dvb.frontend != NULL) {
		dvb_attach(xc5000_attach, port->dvb.frontend,
		&i2c_bus->i2c_adap,
		&hauppauge_hvr1500q_tunerconfig);
		}
		break;
		default:
		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
		dev->name);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ static char *i2c_devs[128] = {
		[ 0x84 >> 1 ] = "tda8295",
		[ 0xa0 >> 1 ] = "eeprom",
		[ 0xc0 >> 1 ] = "tuner/mt2131/tda8275",
		[ 0xc2 >> 1 ] = "tuner/mt2131/tda8275",
		[ 0xc2 >> 1 ] = "tuner/mt2131/tda8275/xc5000",
		};

		static void do_i2c_scan(char name, struct i2c_client c)

drivers/media/video/cx23885/cx23885.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@
		#define CX23885_BOARD_HAUPPAUGE_HVR1800 2
		#define CX23885_BOARD_HAUPPAUGE_HVR1250 3
		#define CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP 4
		#define CX23885_BOARD_HAUPPAUGE_HVR1500Q 5

		enum cx23885_itype {
		CX23885_VMUX_COMPOSITE1 = 1,