Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 58fadc19 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/sgtl5000' of... 

Merge branch 'fix/sgtl5000' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
parents 2f8b3188 c5489f9f

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_component *component = codec_dai->component;

	u16 adcdac_ctrl = SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT;

	u16 i2s_pwr = SGTL5000_I2S_IN_POWERUP;



	snd_soc_component_update_bits(component, 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_component_update_bits(component, SGTL5000_CHIP_DIG_POWER,

			i2s_pwr, mute ? 0 : i2s_pwr);



	return 0;

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

	snd_soc_component_write(component, SGTL5000_DAP_CTRL, 0);



	/* Unmute DAC after start */

	snd_soc_component_update_bits(component, SGTL5000_CHIP_ADCDAC_CTRL,

		SGTL5000_DAC_MUTE_LEFT | SGTL5000_DAC_MUTE_RIGHT, 0);



	return 0;



err: