Merge remote-tracking branch 'asoc/topic/core' into for-tiwai (a9b68d3b) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/soc-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3484,7 +3484,7 @@ int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
		return dai->codec->driver->set_sysclk(dai->codec, clk_id, 0,
		freq, dir);
		else
		return -EINVAL;
		return -ENOTSUPP;
		}
		EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk);

		@@ -3505,7 +3505,7 @@ int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
		return codec->driver->set_sysclk(codec, clk_id, source,
		freq, dir);
		else
		return -EINVAL;
		return -ENOTSUPP;
		}
		EXPORT_SYMBOL_GPL(snd_soc_codec_set_sysclk);

sound/soc/soc-pcm.c

+19 −16

Original line number	Diff line number	Diff line
		@@ -776,7 +776,7 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
		return ret;
		}

		if (platform->driver->ops && platform->driver->bespoke_trigger) {
		if (platform->driver->bespoke_trigger) {
		ret = platform->driver->bespoke_trigger(substream, cmd);
		if (ret < 0)
		return ret;
		@@ -1235,6 +1235,20 @@ static int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
		return err;
		}

		static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,
		struct snd_soc_pcm_stream *stream)
		{
		runtime->hw.rate_min = stream->rate_min;
		runtime->hw.rate_max = stream->rate_max;
		runtime->hw.channels_min = stream->channels_min;
		runtime->hw.channels_max = stream->channels_max;
		if (runtime->hw.formats)
		runtime->hw.formats &= stream->formats;
		else
		runtime->hw.formats = stream->formats;
		runtime->hw.rates = stream->rates;
		}

		static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		@@ -1242,21 +1256,10 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver;

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		runtime->hw.rate_min = cpu_dai_drv->playback.rate_min;
		runtime->hw.rate_max = cpu_dai_drv->playback.rate_max;
		runtime->hw.channels_min = cpu_dai_drv->playback.channels_min;
		runtime->hw.channels_max = cpu_dai_drv->playback.channels_max;
		runtime->hw.formats &= cpu_dai_drv->playback.formats;
		runtime->hw.rates = cpu_dai_drv->playback.rates;
		} else {
		runtime->hw.rate_min = cpu_dai_drv->capture.rate_min;
		runtime->hw.rate_max = cpu_dai_drv->capture.rate_max;
		runtime->hw.channels_min = cpu_dai_drv->capture.channels_min;
		runtime->hw.channels_max = cpu_dai_drv->capture.channels_max;
		runtime->hw.formats &= cpu_dai_drv->capture.formats;
		runtime->hw.rates = cpu_dai_drv->capture.rates;
		}
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		dpcm_init_runtime_hw(runtime, &cpu_dai_drv->playback);
		else
		dpcm_init_runtime_hw(runtime, &cpu_dai_drv->capture);
		}

		static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream)