Merge "ASoC: pcm: Update RX shutdown sequence" (146f9079) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd9335.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -1756,17 +1756,13 @@ static int tasha_codec_enable_slimrx(struct snd_soc_dapm_widget *w,
		&dai->grph);
		break;
		case SND_SOC_DAPM_POST_PMD:
		ret = wcd9xxx_close_slim_sch_rx(core, &dai->wcd9xxx_ch_list,
		dai->grph);
		ret = tasha_codec_enable_slim_chmask(dai, false);
		if (ret < 0) {
		ret = wcd9xxx_disconnect_port(core,
		&dai->wcd9xxx_ch_list,
		ret = wcd9xxx_disconnect_port(core, &dai->wcd9xxx_ch_list,
		dai->grph);
		dev_dbg(codec->dev, "%s: Disconnect RX port, ret = %d\n",
		__func__, ret);
		}

		ret = wcd9xxx_close_slim_sch_rx(core, &dai->wcd9xxx_ch_list,
		dai->grph);
		ret = tasha_codec_enable_slim_chmask(dai, false);
		break;
		}
		return ret;

+15 −14

Original line number	Diff line number	Diff line
		@@ -680,6 +680,20 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
		codec_dai->rate = 0;
		}

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
		/* powered down playback stream now */
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_STOP);
		} else {
		/* start delayed pop wq here for playback streams */
		rtd->pop_wait = 1;
		queue_delayed_work(system_power_efficient_wq,
		&rtd->delayed_work,
		msecs_to_jiffies(rtd->pmdown_time));
		}
		}
		if (cpu_dai->driver->ops->shutdown)
		cpu_dai->driver->ops->shutdown(substream, cpu_dai);

		@@ -695,20 +709,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
		if (platform->driver->ops && platform->driver->ops->close)
		platform->driver->ops->close(substream);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
		/* powered down playback stream now */
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_STOP);
		} else {
		/* start delayed pop wq here for playback streams */
		rtd->pop_wait = 1;
		queue_delayed_work(system_power_efficient_wq,
		&rtd->delayed_work,
		msecs_to_jiffies(rtd->pmdown_time));
		}
		} else {
		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) {
		/* capture streams can be powered down now */
		snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE,
		SND_SOC_DAPM_STREAM_STOP);