Unverified Commit 0c7985e1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from asoc/for-5.15

parents 6880fa6c 7bd5d979

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -17891,7 +17891,8 @@ M: Olivier Moysan <olivier.moysan@foss.st.com> 
M:	Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml

F:	Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

F:	Documentation/devicetree/bindings/sound/st,stm32-*.yaml

F:	sound/soc/stm/









STM32 TIMER/LPTIMER DRIVERS

























sound/soc/fsl/fsl_esai.c



+10
−6






























Original line number
Diff line number
Diff line







@@ -1073,6 +1073,16 @@ static int fsl_esai_probe(struct platform_device *pdev)







	if (ret < 0)









		goto err_pm_get_sync;



















	/*









	 * Register platform component before registering cpu dai for there









	 * is not defer probe for platform component in snd_soc_add_pcm_runtime().









	 */









	ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE);









	if (ret) {









		dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);









		goto err_pm_get_sync;









	}



















	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_esai_component,









					      &fsl_esai_dai, 1);









	if (ret) {








@@ -1082,12 +1092,6 @@ static int fsl_esai_probe(struct platform_device *pdev)

















	INIT_WORK(&esai_priv->work, fsl_esai_hw_reset);



















	ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE);









	if (ret) {









		dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);









		goto err_pm_get_sync;









	}



















	return ret;



















err_pm_get_sync:
































sound/soc/fsl/fsl_micfil.c



+10
−5






























Original line number
Diff line number
Diff line







@@ -737,18 +737,23 @@ static int fsl_micfil_probe(struct platform_device *pdev)







	pm_runtime_enable(&pdev->dev);









	regcache_cache_only(micfil->regmap, true);



















	/*









	 * Register platform component before registering cpu dai for there









	 * is not defer probe for platform component in snd_soc_add_pcm_runtime().









	 */









	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);









	if (ret) {









		dev_err(&pdev->dev, "failed to pcm register\n");









		return ret;









	}



















	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_micfil_component,









					      &fsl_micfil_dai, 1);









	if (ret) {









		dev_err(&pdev->dev, "failed to register component %s\n",









			fsl_micfil_component.name);









		return ret;









	}



















	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);









	if (ret)









		dev_err(&pdev->dev, "failed to pcm register\n");



















	return ret;









}










































sound/soc/fsl/fsl_sai.c



+9
−5






























Original line number
Diff line number
Diff line







@@ -1152,11 +1152,10 @@ static int fsl_sai_probe(struct platform_device *pdev)







	if (ret < 0)









		goto err_pm_get_sync;



















	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component,









					      &sai->cpu_dai_drv, 1);









	if (ret)









		goto err_pm_get_sync;



















	/*









	 * Register platform component before registering cpu dai for there









	 * is not defer probe for platform component in snd_soc_add_pcm_runtime().









	 */









	if (sai->soc_data->use_imx_pcm) {









		ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);









		if (ret)








@@ -1167,6 +1166,11 @@ static int fsl_sai_probe(struct platform_device *pdev)







			goto err_pm_get_sync;









	}



















	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component,









					      &sai->cpu_dai_drv, 1);









	if (ret)









		goto err_pm_get_sync;



















	return ret;



















err_pm_get_sync:
































sound/soc/fsl/fsl_spdif.c



+9
−5






























Original line number
Diff line number
Diff line







@@ -1434,16 +1434,20 @@ static int fsl_spdif_probe(struct platform_device *pdev)







	pm_runtime_enable(&pdev->dev);









	regcache_cache_only(spdif_priv->regmap, true);



















	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_spdif_component,









					      &spdif_priv->cpu_dai_drv, 1);









	/*









	 * Register platform component before registering cpu dai for there









	 * is not defer probe for platform component in snd_soc_add_pcm_runtime().









	 */









	ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);









	if (ret) {









		dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);









		dev_err_probe(&pdev->dev, ret, "imx_pcm_dma_init failed\n");









		goto err_pm_disable;









	}



















	ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);









	ret = devm_snd_soc_register_component(&pdev->dev, &fsl_spdif_component,









					      &spdif_priv->cpu_dai_drv, 1);









	if (ret) {









		dev_err_probe(&pdev->dev, ret, "imx_pcm_dma_init failed\n");









		dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);









		goto err_pm_disable;









	}