diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2012-05-14 18:50:53 -0500 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:37:34 +0800 |
| commit | 448a154b838a3dfececc1b068b5625cd249081f8 (patch) | |
| tree | adffd94127c25d37a78e2b471fa83c9727ed8f93 /sound | |
| parent | 1df3a2cfa951b5a411779c49550776ea8a152391 (diff) | |
ENGR00209384-2 mxc_spdif: capture playback start function
* Add start capture/playback function
Start sequence for capturing/playing audio data.
* Remove caprure/playback prepere function hwd initialization
handled by trigger function when user/app starts capture/play
process.
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/mxc_spdif.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/sound/soc/codecs/mxc_spdif.c b/sound/soc/codecs/mxc_spdif.c index 8c163fbd7c7d..445650f749d9 100644 --- a/sound/soc/codecs/mxc_spdif.c +++ b/sound/soc/codecs/mxc_spdif.c @@ -552,7 +552,7 @@ failed_clk: return err; } -static int mxc_spdif_playback_prepare(struct snd_pcm_substream *substream, +static int mxc_spdif_playback_start(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_codec *codec = dai->codec; @@ -648,6 +648,7 @@ static int mxc_spdif_playback_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = mxc_spdif_playback_start(substream, dai); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: @@ -703,7 +704,7 @@ failed_clk: return err; } -static int mxc_spdif_capture_prepare(struct snd_pcm_substream *substream, +static int mxc_spdif_capture_start(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_codec *codec = dai->codec; @@ -799,6 +800,7 @@ static int mxc_spdif_capture_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = mxc_spdif_capture_start(substream, dai); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: @@ -1158,19 +1160,6 @@ static void mxc_spdif_shutdown(struct snd_pcm_substream *substream, clk_disable(plat_data->spdif_core_clk); } -static int mxc_spdif_prepare(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - int ret; - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - ret = mxc_spdif_playback_prepare(substream, dai); - else - ret = mxc_spdif_capture_prepare(substream, dai); - - return ret; -} - static int mxc_spdif_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { @@ -1186,7 +1175,6 @@ static int mxc_spdif_trigger(struct snd_pcm_substream *substream, struct snd_soc_dai_ops mxc_spdif_codec_dai_ops = { .startup = mxc_spdif_startup, - .prepare = mxc_spdif_prepare, .trigger = mxc_spdif_trigger, .shutdown = mxc_spdif_shutdown, }; |