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

Commit 2365b2d3 authored by David Wong's avatar David Wong Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12272): cx23885: add card Magic-Pro ProHDTV Extreme 2



cx23885: add card Magic-Pro  ProHDTV Extreme 2 PCI-E.

Signed-off-by: default avatarDavid T.L. Wong <davidtlwong@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b80dc1c6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -21,3 +21,4 @@
 20 -> Hauppauge WinTV-HVR1255                             [0070:2251]
 21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295]
 22 -> Mygica X8506 DMB-TH                                 [14f1:8651]
 23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]
+11 −1
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ struct cx23885_board cx23885_boards[] = {
		.name		= "Mygica X8506 DMB-TH",
		.portb		= CX23885_MPEG_DVB,
	},
	[CX23885_BOARD_MAGICPRO_PROHDTVE2] = {
		.name		= "Magic-Pro ProHDTV Extreme 2",
		.portb		= CX23885_MPEG_DVB,
	},
};
const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);

@@ -324,6 +328,10 @@ struct cx23885_subid cx23885_subids[] = {
		.subvendor = 0x14f1,
		.subdevice = 0x8651,
		.card      = CX23885_BOARD_MYGICA_X8506,
	}, {
		.subvendor = 0x14f1,
		.subdevice = 0x8657,
		.card      = CX23885_BOARD_MAGICPRO_PROHDTVE2,
	},
};
const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -715,8 +723,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
		cx23885_gpio_set(dev, GPIO_9);
		break;
	case CX23885_BOARD_MYGICA_X8506:
	case CX23885_BOARD_MAGICPRO_PROHDTVE2:
		/* GPIO-1 reset XC5000 */
		/* GPIO-2 reset LGS8GL5 */
		/* GPIO-2 reset LGS8GL5 / LGS8G75 */
		cx_set(GP0_IO, 0x00060000);
		cx_clear(GP0_IO, 0x00000006);
		mdelay(100);
@@ -827,6 +836,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
		ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
		break;
	case CX23885_BOARD_MYGICA_X8506:
	case CX23885_BOARD_MAGICPRO_PROHDTVE2:
		ts1->gen_ctrl_val  = 0x5; /* Parallel */
		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
		ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+33 −0
Original line number Diff line number Diff line
@@ -487,6 +487,26 @@ static int cx23885_dvb_set_frontend(struct dvb_frontend *fe,
		port->set_frontend_save(fe, param) : -ENODEV;
}

static struct lgs8gxx_config magicpro_prohdtve2_lgs8g75_config = {
	.prod = LGS8GXX_PROD_LGS8G75,
	.demod_address = 0x19,
	.serial_ts = 0,
	.ts_clk_pol = 1,
	.ts_clk_gated = 1,
	.if_clk_freq = 30400, /* 30.4 MHz */
	.if_freq = 6500, /* 6.50 MHz */
	.if_neg_center = 1,
	.ext_adc = 0,
	.adc_signed = 1,
	.adc_vpp = 2, /* 1.6 Vpp */
	.if_neg_edge = 1,
};

static struct xc5000_config magicpro_prohdtve2_xc5000_config = {
	.i2c_address = 0x61,
	.if_khz = 6500,
};

static int dvb_register(struct cx23885_tsport *port)
{
	struct cx23885_dev *dev = port->dev;
@@ -833,6 +853,19 @@ static int dvb_register(struct cx23885_tsport *port)
				&mygica_x8506_xc5000_config);
		}
		break;
	case CX23885_BOARD_MAGICPRO_PROHDTVE2:
		i2c_bus = &dev->i2c_bus[0];
		i2c_bus2 = &dev->i2c_bus[1];
		fe0->dvb.frontend = dvb_attach(lgs8gxx_attach,
			&magicpro_prohdtve2_lgs8g75_config,
			&i2c_bus->i2c_adap);
		if (fe0->dvb.frontend != NULL) {
			dvb_attach(xc5000_attach,
				fe0->dvb.frontend,
				&i2c_bus2->i2c_adap,
				&magicpro_prohdtve2_xc5000_config);
		}
		break;
	default:
		printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
			" isn't supported yet\n",
+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@
#define CX23885_BOARD_HAUPPAUGE_HVR1255        20
#define CX23885_BOARD_HAUPPAUGE_HVR1210        21
#define CX23885_BOARD_MYGICA_X8506             22
#define CX23885_BOARD_MAGICPRO_PROHDTVE2       23

#define GPIO_0 0x00000001
#define GPIO_1 0x00000002