Unverified Commit 0cbbf8a0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-link: add snd_soc_link_be_hw_params_fixup() 



dai_link related function should be implemented at soc-link.c.
This patch adds snd_soc_link_be_hw_params_fixup().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87wo503k73.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7cf3c5b4

include/sound/soc-link.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
#define __SOC_LINK_H



int snd_soc_link_init(struct snd_soc_pcm_runtime *rtd);

int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				    struct snd_pcm_hw_params *params);



int snd_soc_link_startup(struct snd_pcm_substream *substream);

void snd_soc_link_shutdown(struct snd_pcm_substream *substream);

int snd_soc_link_prepare(struct snd_pcm_substream *substream);

sound/soc/soc-core.c

+5 −1
Original line number Diff line number Diff line
@@ -1656,7 +1656,11 @@ match: 
			dai_link->dpcm_playback = 1;

			dai_link->dpcm_capture = 1;



			/* override any BE fixups */

			/*

			 * override any BE fixups

			 * see

			 *	snd_soc_link_be_hw_params_fixup()

			 */

			dai_link->be_hw_params_fixup =

				component->driver->be_hw_params_fixup;

sound/soc/soc-dai.c

+4 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <sound/soc.h>

#include <sound/soc-dai.h>

#include <sound/soc-link.h>



#define soc_dai_ret(dai, ret) _soc_dai_ret(dai, __func__, ret)

static inline int _soc_dai_ret(struct snd_soc_dai *dai,
@@ -313,11 +314,9 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai, 
	int ret = 0;



	/* perform any topology hw_params fixups before DAI  */

	if (rtd->dai_link->be_hw_params_fixup) {

		ret = rtd->dai_link->be_hw_params_fixup(rtd, params);

	ret = snd_soc_link_be_hw_params_fixup(rtd, params);

	if (ret < 0)

		goto end;

	}



	if (dai->driver->ops &&

	    dai->driver->ops->hw_params)

sound/soc/soc-link.c

+11 −0
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ int snd_soc_link_init(struct snd_soc_pcm_runtime *rtd) 
	return soc_link_ret(rtd, ret);

}



int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				    struct snd_pcm_hw_params *params)

{

	int ret = 0;



	if (rtd->dai_link->be_hw_params_fixup)

		ret = rtd->dai_link->be_hw_params_fixup(rtd, params);



	return soc_link_ret(rtd, ret);

}



int snd_soc_link_startup(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

sound/soc/soc-pcm.c

+3 −10
Original line number Diff line number Diff line
@@ -2079,16 +2079,9 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) 
				sizeof(struct snd_pcm_hw_params));



		/* perform any hw_params fixups */

		if (be->dai_link->be_hw_params_fixup) {

			ret = be->dai_link->be_hw_params_fixup(be,

					&dpcm->hw_params);

			if (ret < 0) {

				dev_err(be->dev,

					"ASoC: hw_params BE fixup failed %d\n",

					ret);

		ret = snd_soc_link_be_hw_params_fixup(be, &dpcm->hw_params);

		if (ret < 0)

			goto unwind;

			}

		}



		/* copy the fixed-up hw params for BE dai */

		memcpy(&be->dpcm[stream].hw_params, &dpcm->hw_params,

CRA Git | Maintained and supported by SUSTech CRA and CCSE