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

Commit b3999970 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

A small fix for the SSI driver and a fix for system shutdown with modern
devices.  Most of the modern devices will never get shut down normally
with a visible kernel log as the systems they're in tend not to shut
down often and when they do it's usually in form factors that don't have
a user visible console.
parents 3868137e 5ed80a75

sound/soc/imx/imx-ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
		break;

	case SND_SOC_DAIFMT_DSP_A:

		/* data on rising edge of bclk, frame high 1clk before data */

		strcr |= SSI_STCR_TFSL | SSI_STCR_TEFS;

		strcr |= SSI_STCR_TFSL | SSI_STCR_TXBIT0 | SSI_STCR_TEFS;

		break;

	}

sound/soc/soc-dapm.c

+9 −3
Original line number Diff line number Diff line
@@ -3068,9 +3068,13 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) 
	 * standby.

	 */

	if (powerdown) {

		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_PREPARE);

		if (dapm->bias_level == SND_SOC_BIAS_ON)

			snd_soc_dapm_set_bias_level(dapm,

						    SND_SOC_BIAS_PREPARE);

		dapm_seq_run(dapm, &down_list, 0, false);

		snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY);

		if (dapm->bias_level == SND_SOC_BIAS_PREPARE)

			snd_soc_dapm_set_bias_level(dapm,

						    SND_SOC_BIAS_STANDBY);

	}

}
@@ -3083,7 +3087,9 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card) 


	list_for_each_entry(codec, &card->codec_dev_list, list) {

		soc_dapm_shutdown_codec(&codec->dapm);

		snd_soc_dapm_set_bias_level(&codec->dapm, SND_SOC_BIAS_OFF);

		if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)

			snd_soc_dapm_set_bias_level(&codec->dapm,

						    SND_SOC_BIAS_OFF);

	}

}