diff options
| author | Hartmut Hackmann <devnull@localhost> | 2005-05-18 22:46:17 +0000 |
|---|---|---|
| committer | Hartmut Hackmann <devnull@localhost> | 2005-05-18 22:46:17 +0000 |
| commit | 94897285be983e7fb8336e09fe0c405fa2cdbced (patch) | |
| tree | a8b27df75bc97046c472e7bec46e2364070dce31 | |
| parent | 7cc8cd4a05c6c8ad50c10ad80e0293bd050358c7 (diff) | |
| download | mediapointer-dvb-s2-94897285be983e7fb8336e09fe0c405fa2cdbced.tar.gz mediapointer-dvb-s2-94897285be983e7fb8336e09fe0c405fa2cdbced.tar.bz2 | |
- corrected clock routing for oss sound
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 6f30e2dda..7a18a0a36 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-tvaudio.c,v 1.22 2005/01/07 13:11:19 kraxel Exp $ + * $Id: saa7134-tvaudio.c,v 1.23 2005/05/18 22:46:17 hhackmann Exp $ * * device driver for philips saa7134 based TV cards * tv audio decoder (fm stereo, nicam, ...) @@ -181,7 +181,8 @@ static void tvaudio_init(struct saa7134_dev *dev) saa_writeb(SAA7134_AUDIO_CLOCK0, clock & 0xff); saa_writeb(SAA7134_AUDIO_CLOCK1, (clock >> 8) & 0xff); saa_writeb(SAA7134_AUDIO_CLOCK2, (clock >> 16) & 0xff); - saa_writeb(SAA7134_AUDIO_PLL_CTRL, 0x01); + // frame locked audio was reported not to be reliable + saa_writeb(SAA7134_AUDIO_PLL_CTRL, 0x02); saa_writeb(SAA7134_NICAM_ERROR_LOW, 0x14); saa_writeb(SAA7134_NICAM_ERROR_HIGH, 0x50); @@ -250,7 +251,12 @@ static void mute_input_7134(struct saa7134_dev *dev) saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, ausel); saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x08, ics); saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x07, ocs); - + // for oss, we need to change the clock configuration + if (in->amux == TV) + saa_andorb(SAA7134_SIF_SAMPLE_FREQ, 0x03, 0x00); + else + saa_andorb(SAA7134_SIF_SAMPLE_FREQ, 0x03, 0x01); + /* switch gpio-connected external audio mux */ if (0 == card(dev).gpiomask) return; |