mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 06:32:50 +00:00
V4L/DVB (9131): cx18: Add entries for the Leadtek PVR2100 and Toshiba Qosmio DVB-T/Analog
cx18: Add entries for the Leadtek PVR2100 and Toshiba Qosmio DVB-T/Analog capture cards. Both cards are hybrids cards, but no digital capture functionality has been added yet. These entries are a first guess at the card entries to get analog working, given the information available. Terry Wu <terrywu at leadtek.com.tw> provided a pointer to information for the PVR2100. Martin Juhl <mj at casalogic.dk>, an owner of the Toshiba DVB-T/Analog tuner card, provided the DDR timing information from his Windows inf file. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andy Walls
Mauro Carvalho Chehab
parent
f1918fa284
commit
9eee4fb69e
@ -292,12 +292,111 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/* Toshiba Qosmio laptop internal DVB-T/Analog Hybrid Tuner */
|
||||
|
||||
static const struct cx18_card_pci_info cx18_pci_toshiba_qosmio_dvbt[] = {
|
||||
{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_TOSHIBA, 0x0110 },
|
||||
{ 0, 0, 0 }
|
||||
};
|
||||
|
||||
static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
|
||||
.type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,
|
||||
.name = "Toshiba Qosmio DVB-T/Analog",
|
||||
.comment = "Experimenters and photos needed for device to work well.\n"
|
||||
"\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
|
||||
.v4l2_capabilities = CX18_CAP_ENCODER,
|
||||
.hw_audio_ctrl = CX18_HW_CX23418,
|
||||
.hw_all = CX18_HW_TUNER,
|
||||
.video_inputs = {
|
||||
{ CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE6 },
|
||||
{ CX18_CARD_INPUT_SVIDEO1, 1,
|
||||
CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
|
||||
{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },
|
||||
},
|
||||
.audio_inputs = {
|
||||
{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 },
|
||||
{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },
|
||||
},
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
|
||||
},
|
||||
.ddr = {
|
||||
.chip_config = 0x202,
|
||||
.refresh = 0x3bb,
|
||||
.timing1 = 0x33320a63,
|
||||
.timing2 = 0x0a,
|
||||
.tune_lane = 0,
|
||||
.initial_emrs = 0x42,
|
||||
},
|
||||
.xceive_pin = 15,
|
||||
.pci_list = cx18_pci_toshiba_qosmio_dvbt,
|
||||
.i2c = &cx18_i2c_std,
|
||||
};
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/* Leadtek WinFast PVR2100 */
|
||||
|
||||
static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {
|
||||
{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 },
|
||||
{ 0, 0, 0 }
|
||||
};
|
||||
|
||||
static const struct cx18_card cx18_card_leadtek_pvr2100 = {
|
||||
.type = CX18_CARD_LEADTEK_PVR2100,
|
||||
.name = "Leadtek WinFast PVR2100",
|
||||
.comment = "Experimenters and photos needed for device to work well.\n"
|
||||
"\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
|
||||
.v4l2_capabilities = CX18_CAP_ENCODER,
|
||||
.hw_audio_ctrl = CX18_HW_CX23418,
|
||||
.hw_muxer = CX18_HW_GPIO,
|
||||
.hw_all = CX18_HW_TUNER | CX18_HW_GPIO,
|
||||
.video_inputs = {
|
||||
{ CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 },
|
||||
{ CX18_CARD_INPUT_SVIDEO1, 1,
|
||||
CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
|
||||
{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
|
||||
},
|
||||
.audio_inputs = {
|
||||
{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 },
|
||||
{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },
|
||||
},
|
||||
.tuners = {
|
||||
/* XC3028 tuner */
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
|
||||
},
|
||||
.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },
|
||||
.ddr = {
|
||||
/*
|
||||
* Pointer to proper DDR config values provided by
|
||||
* Terry Wu <terrywu at leadtek.com.tw>
|
||||
*/
|
||||
.chip_config = 0x303,
|
||||
.refresh = 0x3bb,
|
||||
.timing1 = 0x24220e83,
|
||||
.timing2 = 0x1f,
|
||||
.tune_lane = 0,
|
||||
.initial_emrs = 0x2,
|
||||
},
|
||||
.gpio_init.initial_value = 0x6,
|
||||
.gpio_init.direction = 0x7,
|
||||
.gpio_audio_input = { .mask = 0x7,
|
||||
.tuner = 0x6, .linein = 0x2, .radio = 0x2 },
|
||||
.xceive_pin = 15,
|
||||
.pci_list = cx18_pci_leadtek_pvr2100,
|
||||
.i2c = &cx18_i2c_std,
|
||||
};
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
static const struct cx18_card *cx18_card_list[] = {
|
||||
&cx18_card_hvr1600_esmt,
|
||||
&cx18_card_hvr1600_samsung,
|
||||
&cx18_card_h900,
|
||||
&cx18_card_mpc718,
|
||||
&cx18_card_cnxt_raptor_pal,
|
||||
&cx18_card_toshiba_qosmio_dvbt,
|
||||
&cx18_card_leadtek_pvr2100,
|
||||
};
|
||||
|
||||
const struct cx18_card *cx18_get_card(u16 index)
|
||||
|
||||
@ -130,6 +130,8 @@ MODULE_PARM_DESC(cardtype,
|
||||
"\t\t\t 3 = Compro VideoMate H900\n"
|
||||
"\t\t\t 4 = Yuan MPC718\n"
|
||||
"\t\t\t 5 = Conexant Raptor PAL/SECAM\n"
|
||||
"\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"
|
||||
"\t\t\t 7 = Leadtek WinFast PVR2100\n"
|
||||
"\t\t\t 0 = Autodetect (default)\n"
|
||||
"\t\t\t-1 = Ignore this card\n\t\t");
|
||||
MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
|
||||
|
||||
@ -79,7 +79,9 @@
|
||||
#define CX18_CARD_COMPRO_H900 2 /* Compro VideoMate H900 */
|
||||
#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */
|
||||
#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */
|
||||
#define CX18_CARD_LAST 4
|
||||
#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
|
||||
#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */
|
||||
#define CX18_CARD_LAST 6
|
||||
|
||||
#define CX18_ENC_STREAM_TYPE_MPG 0
|
||||
#define CX18_ENC_STREAM_TYPE_TS 1
|
||||
@ -99,6 +101,8 @@
|
||||
#define CX18_PCI_ID_COMPRO 0x185b
|
||||
#define CX18_PCI_ID_YUAN 0x12ab
|
||||
#define CX18_PCI_ID_CONEXANT 0x14f1
|
||||
#define CX18_PCI_ID_TOSHIBA 0x1179
|
||||
#define CX18_PCI_ID_LEADTEK 0x107D
|
||||
|
||||
/* ======================================================================== */
|
||||
/* ========================== START USER SETTABLE DMA VARIABLES =========== */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user