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

Commit 33484c67 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95031' into asoc-linus

parents af6b7a82 c7d910b8 cdd3d2a9

sound/soc/codecs/sgtl5000.c

+1 −7
Original line number Diff line number Diff line
@@ -1151,13 +1151,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) 
		/* Enable VDDC charge pump */

		ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;

	} else if (vddio >= 3100 && vdda >= 3100) {

		/*

		 * if vddio and vddd > 3.1v,

		 * charge pump should be clean before set ana_pwr

		 */

		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,

				SGTL5000_VDDC_CHRGPMP_POWERUP, 0);



		ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;

		/* VDDC use VDDIO rail */

		lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;

		lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<

sound/soc/codecs/sn95031.c

+2 −2
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = { 
	/* speaker map */

	{ "IHFOUTL", NULL, "Speaker Rail"},

	{ "IHFOUTR", NULL, "Speaker Rail"},

	{ "IHFOUTL", "NULL", "Speaker Left Playback"},

	{ "IHFOUTR", "NULL", "Speaker Right Playback"},

	{ "IHFOUTL", NULL, "Speaker Left Playback"},

	{ "IHFOUTR", NULL, "Speaker Right Playback"},

	{ "Speaker Left Playback", NULL, "Speaker Left Filter"},

	{ "Speaker Right Playback", NULL, "Speaker Right Filter"},

	{ "Speaker Left Filter", NULL, "IHFDAC Left"},