[media] Add support for Prof Revolution DVB-S2 8000 PCI-E card
The device is based on STV0903 demodulator, STB6100 tuner and CX23885 chipset; subsystem id: 8000:3034 This is a modified version of the official Prof Tuners Group patch: http://www.proftuners.com/sites/default/files/prof8000_0.patch [mchehab@redhat.com: trivial merge conflict fixup] Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mariusz Bia?o?czyk
Mauro Carvalho Chehab
parent
298efdd376
commit
f667190be1
|
|
@ -35,3 +35,4 @@
|
|||
34 -> TerraTec Cinergy T PCIe Dual [153b:117e]
|
||||
35 -> TeVii S471 [d471:9022]
|
||||
36 -> Hauppauge WinTV-HVR1255 [0070:2259]
|
||||
37 -> Prof Revolution DVB-S2 8000 [8000:3034]
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ config VIDEO_CX23885
|
|||
select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_TDA10048 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
|
||||
|
|
|
|||
|
|
@ -565,6 +565,10 @@ struct cx23885_board cx23885_boards[] = {
|
|||
[CX23885_BOARD_TEVII_S471] = {
|
||||
.name = "TeVii S471",
|
||||
.portb = CX23885_MPEG_DVB,
|
||||
},
|
||||
[CX23885_BOARD_PROF_8000] = {
|
||||
.name = "Prof Revolution DVB-S2 8000",
|
||||
.portb = CX23885_MPEG_DVB,
|
||||
}
|
||||
};
|
||||
const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
|
||||
|
|
@ -777,6 +781,10 @@ struct cx23885_subid cx23885_subids[] = {
|
|||
.subvendor = 0xd471,
|
||||
.subdevice = 0x9022,
|
||||
.card = CX23885_BOARD_TEVII_S471,
|
||||
}, {
|
||||
.subvendor = 0x8000,
|
||||
.subdevice = 0x3034,
|
||||
.card = CX23885_BOARD_PROF_8000,
|
||||
},
|
||||
};
|
||||
const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
|
||||
|
|
@ -1156,6 +1164,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
|
|||
cx_set(GP0_IO, 0x00040004);
|
||||
break;
|
||||
case CX23885_BOARD_TBS_6920:
|
||||
case CX23885_BOARD_PROF_8000:
|
||||
cx_write(MC417_CTL, 0x00000036);
|
||||
cx_write(MC417_OEN, 0x00001000);
|
||||
cx_set(MC417_RWD, 0x00000002);
|
||||
|
|
@ -1540,6 +1549,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
|
|||
case CX23885_BOARD_TEVII_S470:
|
||||
case CX23885_BOARD_TEVII_S471:
|
||||
case CX23885_BOARD_DVBWORLD_2005:
|
||||
case CX23885_BOARD_PROF_8000:
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,9 @@
|
|||
#include "stv0367.h"
|
||||
#include "drxk.h"
|
||||
#include "mt2063.h"
|
||||
#include "stv090x.h"
|
||||
#include "stb6100.h"
|
||||
#include "stb6100_cfg.h"
|
||||
|
||||
static unsigned int debug;
|
||||
|
||||
|
|
@ -489,6 +492,42 @@ static struct xc5000_config mygica_x8506_xc5000_config = {
|
|||
.if_khz = 5380,
|
||||
};
|
||||
|
||||
static struct stv090x_config prof_8000_stv090x_config = {
|
||||
.device = STV0903,
|
||||
.demod_mode = STV090x_SINGLE,
|
||||
.clk_mode = STV090x_CLK_EXT,
|
||||
.xtal = 27000000,
|
||||
.address = 0x6A,
|
||||
.ts1_mode = STV090x_TSMODE_PARALLEL_PUNCTURED,
|
||||
.repeater_level = STV090x_RPTLEVEL_64,
|
||||
.adc1_range = STV090x_ADC_2Vpp,
|
||||
.diseqc_envelope_mode = false,
|
||||
|
||||
.tuner_get_frequency = stb6100_get_frequency,
|
||||
.tuner_set_frequency = stb6100_set_frequency,
|
||||
.tuner_set_bandwidth = stb6100_set_bandwidth,
|
||||
.tuner_get_bandwidth = stb6100_get_bandwidth,
|
||||
};
|
||||
|
||||
static struct stb6100_config prof_8000_stb6100_config = {
|
||||
.tuner_address = 0x60,
|
||||
.refclock = 27000000,
|
||||
};
|
||||
|
||||
static int p8000_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
|
||||
{
|
||||
struct cx23885_tsport *port = fe->dvb->priv;
|
||||
struct cx23885_dev *dev = port->dev;
|
||||
|
||||
if (voltage == SEC_VOLTAGE_18)
|
||||
cx_write(MC417_RWD, 0x00001e00);
|
||||
else if (voltage == SEC_VOLTAGE_13)
|
||||
cx_write(MC417_RWD, 0x00001a00);
|
||||
else
|
||||
cx_write(MC417_RWD, 0x00001800);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
|
||||
{
|
||||
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
|
||||
|
|
@ -1186,6 +1225,23 @@ static int dvb_register(struct cx23885_tsport *port)
|
|||
&tevii_ds3000_config,
|
||||
&i2c_bus->i2c_adap);
|
||||
break;
|
||||
case CX23885_BOARD_PROF_8000:
|
||||
i2c_bus = &dev->i2c_bus[0];
|
||||
|
||||
fe0->dvb.frontend = dvb_attach(stv090x_attach,
|
||||
&prof_8000_stv090x_config,
|
||||
&i2c_bus->i2c_adap,
|
||||
STV090x_DEMODULATOR_0);
|
||||
if (fe0->dvb.frontend != NULL) {
|
||||
if (!dvb_attach(stb6100_attach,
|
||||
fe0->dvb.frontend,
|
||||
&prof_8000_stb6100_config,
|
||||
&i2c_bus->i2c_adap))
|
||||
goto frontend_detach;
|
||||
|
||||
fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
|
||||
" isn't supported yet\n",
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@
|
|||
#define CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL 34
|
||||
#define CX23885_BOARD_TEVII_S471 35
|
||||
#define CX23885_BOARD_HAUPPAUGE_HVR1255_22111 36
|
||||
#define CX23885_BOARD_PROF_8000 37
|
||||
|
||||
#define GPIO_0 0x00000001
|
||||
#define GPIO_1 0x00000002
|
||||
|
|
|
|||
Reference in New Issue