Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus (7dfe7e18) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/intel/boards/bytcr_rt5640.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
		* for Jack detection and button press
		*/
		ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_RCCLK,
		0,
		48000 * 512,
		SND_SOC_CLOCK_IN);
		if (!ret) {
		if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && priv->mclk)
		@@ -825,10 +825,20 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
		if ((byt_rt5640_quirk & BYT_RT5640_MCLK_EN) && (is_valleyview())) {
		priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
		if (IS_ERR(priv->mclk)) {
		ret_val = PTR_ERR(priv->mclk);

		dev_err(&pdev->dev,
		"Failed to get MCLK from pmc_plt_clk_3: %ld\n",
		PTR_ERR(priv->mclk));
		return PTR_ERR(priv->mclk);
		"Failed to get MCLK from pmc_plt_clk_3: %d\n",
		ret_val);

		/*
		* Fall back to bit clock usage for -ENOENT (clock not
		* available likely due to missing dependencies), bail
		* for all other errors, including -EPROBE_DEFER
		*/
		if (ret_val != -ENOENT)
		return ret_val;
		byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN;
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,9 @@ static int skl_pcm_open(struct snd_pcm_substream *substream,
		snd_pcm_set_sync(substream);

		mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream);
		if (!mconfig)
		return -EINVAL;

		skl_tplg_d0i3_get(skl, mconfig->d0i3_caps);

		return 0;

+3 −0

Original line number	Diff line number	Diff line
		@@ -515,6 +515,9 @@ EXPORT_SYMBOL_GPL(skl_sst_init_fw);

		void skl_sst_dsp_cleanup(struct device dev, struct skl_sst ctx)
		{

		if (ctx->dsp->fw)
		release_firmware(ctx->dsp->fw);
		skl_clear_module_table(ctx->dsp);
		skl_freeup_uuid_list(ctx);
		skl_ipc_free(&ctx->ipc);