diff options
| author | Steven Toth | 2006-01-09 18:25:17 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2006-01-09 18:25:17 +0100 |
| commit | 0345c387de72b5d7fbfeda9d92818fa7013a6d1c (patch) | |
| tree | 2d1b8277b7c5989aa1c8f75fa25f51f881c7a4ae /drivers/media/video/cx88/cx88-tvaudio.c | |
| parent | V4L/DVB (3110): Replace all uses of pci_module_init with pci_register_driver (diff) | |
| download | kernel-qcow2-linux-0345c387de72b5d7fbfeda9d92818fa7013a6d1c.tar.gz kernel-qcow2-linux-0345c387de72b5d7fbfeda9d92818fa7013a6d1c.tar.xz kernel-qcow2-linux-0345c387de72b5d7fbfeda9d92818fa7013a6d1c.zip | |
V4L/DVB (3112): Several fixes for Hauppauge Roselyn Design (blackbird)
- This patch adds eeprom awareness for the Roslyn. In effect, the
blackbird will query the tuner V4L2_STD_xxxx definitions to determine
whether it's connected to a NTSC or PAL tuner. Based on that, various
default values will change for blackbird encoding.
- Fixes back panel SVIDEO/COMPOSITE with audio, work properly.
- Fixes a problem with lip sync issues, due to bad framerate vs
audio rate assumptions.
- Fixed a problem with the GPIO configuration in cx88-cards.
- Removed the comments in cx88-cards that made no sense.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index a1b120c8a9b5..00051a4c1dc2 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c @@ -139,7 +139,11 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) if (cx88_boards[core->board].blackbird) { /* sets sound input from external adc */ - cx_set(AUD_CTL, EN_I2SIN_ENABLE); + if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) + cx_clear(AUD_CTL, EN_I2SIN_ENABLE); + else + cx_set(AUD_CTL, EN_I2SIN_ENABLE); + cx_write(AUD_I2SINPUTCNTL, 4); cx_write(AUD_BAUDRATE, 1); /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */ |