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

V4L/DVB (7647): Add support for the Hauppauge HVR-1700 digital mode 



This adds support for DVB-T mode only, analog is not supported.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2770b7d7

Documentation/video4linux/CARDLIST.cx23885

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ 
  5 -> Hauppauge WinTV-HVR1500Q                            [0070:7790,0070:7797]

  6 -> Hauppauge WinTV-HVR1500                             [0070:7710,0070:7717]

  7 -> Hauppauge WinTV-HVR1200                             [0070:71d1]

  8 -> Hauppauge WinTV-HVR1700                             [0070:8101]

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

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

		.portc		= CX23885_MPEG_DVB,

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1700] = {

		.name		= "Hauppauge WinTV-HVR1700",

		.portc		= CX23885_MPEG_DVB,

	},

};

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

		.subdevice = 0x71d1,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1200,

	}, {

		.subvendor = 0x0070,

		.subdevice = 0x8101,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1700,

	},

};

const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -243,6 +251,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) 
	case 79561: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */

	case 79571: /* WinTV-HVR1250 (PCIe, OEM, No IR, full height, ATSC and Basic analog */

	case 79671: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */

	case 81519:

		/* WinTV-HVR1700 (PCIe, Retail, No IR, half height,

		 * DVB-T and MPEG2 HW Encoder */

		break;

	default:

		printk("%s: warning: unknown hauppauge model #%d\n", dev->name, tv.model);
@@ -326,6 +337,27 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) 
		/* GPIO-0 tda10048 demodulator reset */

		/* GPIO-2 tda18271 tuner reset */



		/* Put the parts into reset and back */

		cx_set(GP0_IO, 0x00050000);

		mdelay(20);

		cx_clear(GP0_IO, 0x00000005);

		mdelay(20);

		cx_set(GP0_IO, 0x00050005);

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1700:

		/* GPIO-0 TDA10048 demodulator reset */

		/* GPIO-2 TDA8295A Reset */

		/* GPIO-3-10 cx23417 data0-7 */

		/* GPIO-11-14 cx23417 addr0-3 */

		/* GPIO-15-18 cx23417 READY, CS, RD, WR */



		/* The following GPIO's are on the interna AVCore (cx25840) */

		/* GPIO-19 IR_RX */

		/* GPIO-20 IR_TX 416/DVBT Select */

		/* GPIO-21 IIS DAT */

		/* GPIO-22 IIS WCLK */

		/* GPIO-23 IIS BCLK */



		/* Put the parts into reset and back */

		cx_set(GP0_IO, 0x00050000);

		mdelay(20);
@@ -374,6 +406,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

	case CX23885_BOARD_HAUPPAUGE_HVR1200:

	case CX23885_BOARD_HAUPPAUGE_HVR1700:

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

			hauppauge_eeprom(dev, eeprom+0xc0);

		break;
@@ -391,6 +424,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

	case CX23885_BOARD_HAUPPAUGE_HVR1200:

	case CX23885_BOARD_HAUPPAUGE_HVR1700:

	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

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

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR1200:

	case CX23885_BOARD_HAUPPAUGE_HVR1700:

		i2c_bus = &dev->i2c_bus[0];

		port->dvb.frontend = dvb_attach(tda10048_attach,

			&hauppauge_hvr1200_config,

drivers/media/video/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define CX23885_BOARD_HAUPPAUGE_HVR1500Q       5

#define CX23885_BOARD_HAUPPAUGE_HVR1500        6

#define CX23885_BOARD_HAUPPAUGE_HVR1200        7

#define CX23885_BOARD_HAUPPAUGE_HVR1700        8



/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */

#define CX23885_NORMS (\