Unverified Commit c5489f9f authored by Michal Oleszczyk's avatar Michal Oleszczyk Committed by Mark Brown
Browse files

sgtl5000: change digital_mute policy 



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: default avatarMichal Oleszczyk <oleszczyk.m@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb

sound/soc/codecs/sgtl5000.c

+12 −3
Original line number Diff line number Diff line
@@ -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)

{

	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;

}
@@ -1237,6 +1242,10 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) 
	 */

	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;



err:

CRA Git | Maintained and supported by SUSTech CRA and CCSE