diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-07 11:57:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:05:58 -0300 |
| commit | a59bff3714a0f568f25816772ee939796cc7741d (patch) | |
| tree | 8337eac9f1325e1284a705741f1cf2c9c26ae4c6 /drivers/staging/tm6000 | |
| parent | e8cbf0357eb7148b41eb2cd4bb37b0b9532042fc (diff) | |
V4L/DVB: tm6000: Improve set bitrate routines used by alsa
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 2 | ||||
| -rw-r--r-- | drivers/staging/tm6000/tm6000-core.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index 6df2dc8d390f..087137d9164d 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -85,6 +85,8 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip) val |= 0x20; tm6000_set_reg(core, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, val); + tm6000_set_audio_bitrate(core, 48000); + tm6000_set_reg(core, TM6010_REQ08_R01_A_INIT, 0x80); return 0; diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 1656440306a5..cded411d8bba 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -603,8 +603,17 @@ int tm6000_set_audio_bitrate(struct tm6000_core *dev, int bitrate) { int val; + if (dev->dev_type == TM6010) { + val = tm6000_get_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0); + if (val < 0) + return val; + val = (val & 0xf0) | 0x1; /* 48 kHz, not muted */ + val = tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, val); + if (val < 0) + return val; + } + val = tm6000_get_reg(dev, REQ_07_SET_GET_AVREG, 0xeb, 0x0); - printk("Original value=%d\n", val); if (val < 0) return val; |