Commit a59bff37 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e8cbf035

drivers/staging/tm6000/tm6000-alsa.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/staging/tm6000/tm6000-core.c

+10 −1
Original line number Diff line number Diff line
@@ -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;