Commit 3febc04d authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support

- clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder.
- enable blackbird support on the KWorld HardwareMpegTV XPert
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1b77c54e
...@@ -1686,12 +1686,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, ...@@ -1686,12 +1686,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
if (core->tuner_formats & V4L2_STD_525_60) { if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {
dev->height = 480;
dev->params.vi_frame_rate = 30; if (core->tuner_formats & V4L2_STD_525_60) {
} else { dev->height = 480;
dev->height = 576; dev->params.vi_frame_rate = 30;
dev->params.vi_frame_rate = 25; } else {
dev->height = 576;
dev->params.vi_frame_rate = 25;
}
} }
err = cx8802_init_common(dev); err = cx8802_init_common(dev);
......
...@@ -1071,6 +1071,7 @@ struct cx88_board cx88_boards[] = { ...@@ -1071,6 +1071,7 @@ struct cx88_board cx88_boards[] = {
.gpio0 = 0x3de6, .gpio0 = 0x3de6,
.gpio2 = 0x00ff, .gpio2 = 0x00ff,
}, },
.blackbird = 1,
}, },
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = { [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
.name = "DViCO FusionHDTV DVB-T Hybrid", .name = "DViCO FusionHDTV DVB-T Hybrid",
......
...@@ -151,6 +151,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) ...@@ -151,6 +151,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
switch (core->board) { switch (core->board) {
case CX88_BOARD_HAUPPAUGE_ROSLYN: case CX88_BOARD_HAUPPAUGE_ROSLYN:
case CX88_BOARD_KWORLD_MCE200_DELUXE: case CX88_BOARD_KWORLD_MCE200_DELUXE:
case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
cx_clear(AUD_CTL, EN_I2SIN_ENABLE); cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment