korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-05 21:35:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

sgtl5000: change digital_mute policy

Browse Source 
Current implementation mute codec in global way (DAC block).
That means when user routes sound not from I2S but from
AUX source (LINE_IN) it also will be muted by alsa core.
This should not happen.

Signed-off-by: Michal Oleszczyk <oleszczyk.m@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Michal Oleszczyk 2018-02-02 13:10:29 +01:00 committed by Mark Brown
parent 7928b2cbe5
commit c5489f9fc0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/codecs/sgtl5000.c
View File

@ -529,10 +529,15 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
u16 adcdac_ctrl = SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT; u16 i2s_pwr = SGTL5000_I2S_IN_POWERUP;
snd_soc_update_bits(codec, SGTL5000_CHIP_ADCDAC_CTRL, /*
adcdac_ctrl, mute ? adcdac_ctrl : 0); * During 'digital mute' do not mute DAC
* because LINE_IN would be muted aswell. We want to mute
* only I2S block - this can be done by powering it off
*/
snd_soc_update_bits(codec, SGTL5000_CHIP_DIG_POWER,
i2s_pwr, mute ? 0 : i2s_pwr);
return 0; return 0;
} }
@ -1237,6 +1242,10 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
*/ */
snd_soc_write(codec, SGTL5000_DAP_CTRL, 0); snd_soc_write(codec, SGTL5000_DAP_CTRL, 0);
/* Unmute DAC after start */
snd_soc_update_bits(codec, SGTL5000_CHIP_ADCDAC_CTRL,
SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT, 0);
return 0; return 0;
err: err: