Unverified Commit a82cf72f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.5' of... 

Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
parents bb9ee1ea dcf08d0f

sound/soc/codecs/wm8962.c

+2 −2
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, 


	if (target % Fref == 0) {

		fll_div->theta = 0;

		fll_div->lambda = 0;

		fll_div->lambda = 1;

	} else {

		gcd_fll = gcd(target, fratio * Fref);
@@ -2858,7 +2858,7 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s 
		return -EINVAL;

	}



	if (fll_div.theta || fll_div.lambda)

	if (fll_div.theta)

		fll1 |= WM8962_FLL_FRAC;



	/* Stop the FLL while we reconfigure */

sound/soc/fsl/fsl_audmix.c

+8 −1
Original line number Diff line number Diff line
@@ -505,15 +505,20 @@ static int fsl_audmix_probe(struct platform_device *pdev) 
					      ARRAY_SIZE(fsl_audmix_dai));

	if (ret) {

		dev_err(dev, "failed to register ASoC DAI\n");

		return ret;

		goto err_disable_pm;

	}



	priv->pdev = platform_device_register_data(dev, mdrv, 0, NULL, 0);

	if (IS_ERR(priv->pdev)) {

		ret = PTR_ERR(priv->pdev);

		dev_err(dev, "failed to register platform %s: %d\n", mdrv, ret);

		goto err_disable_pm;

	}



	return 0;



err_disable_pm:

	pm_runtime_disable(dev);

	return ret;

}
@@ -521,6 +526,8 @@ static int fsl_audmix_remove(struct platform_device *pdev) 
{

	struct fsl_audmix *priv = dev_get_drvdata(&pdev->dev);



	pm_runtime_disable(&pdev->dev);



	if (priv->pdev)

		platform_device_unregister(priv->pdev);

sound/soc/soc-core.c

+8 −6
Original line number Diff line number Diff line
@@ -448,6 +448,12 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
		goto free_rtd;



	rtd->dev = dev;

	INIT_LIST_HEAD(&rtd->list);

	INIT_LIST_HEAD(&rtd->component_list);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].fe_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients);

	dev_set_drvdata(dev, rtd);

	INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work);
@@ -463,12 +469,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
	/*

	 * rtd remaining settings

	 */

	INIT_LIST_HEAD(&rtd->component_list);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].fe_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients);



	rtd->card = card;

	rtd->dai_link = dai_link;

	if (!rtd->dai_link->ops)
@@ -1768,6 +1768,8 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) 


			/* convert non BE into BE */

			dai_link->no_pcm = 1;

			dai_link->dpcm_playback = 1;

			dai_link->dpcm_capture = 1;



			/* override any BE fixups */

			dai_link->be_hw_params_fixup =

sound/soc/soc-topology.c

+0 −1
Original line number Diff line number Diff line
@@ -549,7 +549,6 @@ static void remove_link(struct snd_soc_component *comp, 
		dobj->ops->link_unload(comp, dobj);



	list_del(&dobj->list);



	snd_soc_remove_pcm_runtime(comp->card,

			snd_soc_get_pcm_runtime(comp->card, link));

sound/soc/sof/imx/imx8.c

+4 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 


	priv->pd_dev = devm_kmalloc_array(&pdev->dev, priv->num_domains,

					  sizeof(*priv->pd_dev), GFP_KERNEL);

	if (!priv)

	if (!priv->pd_dev)

		return -ENOMEM;



	priv->link = devm_kmalloc_array(&pdev->dev, priv->num_domains,
@@ -304,6 +304,9 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
	}

	sdev->mailbox_bar = SOF_FW_BLK_TYPE_SRAM;



	/* set default mailbox offset for FW ready message */

	sdev->dsp_box.offset = MBOX_OFFSET;



	return 0;



exit_pdev_unregister: