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

Merge series "ASoC: Add sdw stream operations to dailink ops." from Bard Liao... 


Merge series "ASoC: Add sdw stream operations to dailink ops." from Bard Liao <yung-chuan.liao@linux.intel.com>:

Sdw stream operation APIs can be called once per stream. Move these
operations to dailink ops. The linked series is "soundwire: Remove sdw
stream operations from Intel soundwire dai".

Reviewed-by: default avatarVinod Koul <vkoul@kernel.org>

Changes in v3:
 - s/ASOC/ASoC

Pierre-Louis Bossart (3):
  ASoC: soc-dai: clarify return value for get_sdw_stream()
  ASoC: Intel: sof_sdw: add dailink .trigger callback
  ASoC: Intel: sof_sdw: add dailink .prepare and .hw_free callback

 include/sound/soc-dai.h          |  3 +-
 sound/soc/intel/boards/sof_sdw.c | 81 ++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

--
2.17.1
parents b40f708d 06998d49

include/sound/soc-dai.h

+2 −1
Original line number Diff line number Diff line
@@ -471,7 +471,8 @@ static inline int snd_soc_dai_set_sdw_stream(struct snd_soc_dai *dai, 
 * This routine only retrieves that was previously configured

 * with snd_soc_dai_get_sdw_stream()

 *

 * Returns pointer to stream or -ENOTSUPP if callback is not supported;

 * Returns pointer to stream or an ERR_PTR value, e.g.

 * ERR_PTR(-ENOTSUPP) if callback is not supported;

 */

static inline void *snd_soc_dai_get_sdw_stream(struct snd_soc_dai *dai,

					       int direction)

sound/soc/intel/boards/sof_sdw.c

+81 −0
Original line number Diff line number Diff line
@@ -225,6 +225,84 @@ int sdw_startup(struct snd_pcm_substream *substream) 
	return sdw_startup_stream(substream);

}



static int sdw_prepare(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;

	struct snd_soc_dai *dai;



	/* Find stream from first CPU DAI */

	dai = asoc_rtd_to_cpu(rtd, 0);



	sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream);



	if (IS_ERR(sdw_stream)) {

		dev_err(rtd->dev, "no stream found for DAI %s", dai->name);

		return PTR_ERR(sdw_stream);

	}



	return sdw_prepare_stream(sdw_stream);

}



static int sdw_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;

	struct snd_soc_dai *dai;

	int ret;



	/* Find stream from first CPU DAI */

	dai = asoc_rtd_to_cpu(rtd, 0);



	sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream);



	if (IS_ERR(sdw_stream)) {

		dev_err(rtd->dev, "no stream found for DAI %s", dai->name);

		return PTR_ERR(sdw_stream);

	}



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

	case SNDRV_PCM_TRIGGER_RESUME:

		ret = sdw_enable_stream(sdw_stream);

		break;



	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_STOP:

		ret = sdw_disable_stream(sdw_stream);

		break;

	default:

		ret = -EINVAL;

		break;

	}



	if (ret)

		dev_err(rtd->dev, "%s trigger %d failed: %d", __func__, cmd, ret);



	return ret;

}



static int sdw_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;

	struct snd_soc_dai *dai;



	/* Find stream from first CPU DAI */

	dai = asoc_rtd_to_cpu(rtd, 0);



	sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream);



	if (IS_ERR(sdw_stream)) {

		dev_err(rtd->dev, "no stream found for DAI %s", dai->name);

		return PTR_ERR(sdw_stream);

	}



	return sdw_deprepare_stream(sdw_stream);

}



void sdw_shutdown(struct snd_pcm_substream *substream)

{

	sdw_shutdown_stream(substream);
@@ -232,6 +310,9 @@ void sdw_shutdown(struct snd_pcm_substream *substream) 


static const struct snd_soc_ops sdw_ops = {

	.startup = sdw_startup,

	.prepare = sdw_prepare,

	.trigger = sdw_trigger,

	.hw_free = sdw_hw_free,

	.shutdown = sdw_shutdown,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE