V4L/DVB: tm6000: Improve set bitrate routines used by alsa

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index 6df2dc8d390f5dc57c68a87eede6bef35dda5389..087137d9164deb1dbf17ba110a0686e7669c6926 100644 (file)
--- 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 1656440306a5f23a65a2f5c5c051e988e8d3281c..cded411d8bba552eff047f068eefbf9adb3720d4 100644 (file)
--- 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;