diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-14 14:27:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-14 14:27:12 +0200 |
| commit | ff2354bc6e54cc7e024744b7b4065a081fd87f6e (patch) | |
| tree | 56a94347fbe5bb8cbb7998ba2e57f658afca3a02 /sound/soc/intel/sst-haswell-ipc.h | |
| parent | 7ca33c7a1d7f8566d8b08a0df55b26758d985a15 (diff) | |
| parent | cffd6665f57ed18f4be9185c4330c8c98c22e201 (diff) | |
Merge tag 'asoc-v3.15-rc5-intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Intel fixes for v3.15
This is a relatively large batch of fixes for the newly added
Haswell/Baytrail drivers from Intel. It's a bit larger than is good for
this point in the cycle but it's all for a newly added driver so not so
worrying as it might otherwise be. Some of it's integration problems,
some of it's the sort of problem usually turned up in stress tests.
Diffstat (limited to 'sound/soc/intel/sst-haswell-ipc.h')
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-haswell-ipc.h b/sound/soc/intel/sst-haswell-ipc.h index d517929ccc3..2ac194a6d04 100644 --- a/sound/soc/intel/sst-haswell-ipc.h +++ b/sound/soc/intel/sst-haswell-ipc.h @@ -464,7 +464,9 @@ int sst_hsw_stream_get_write_pos(struct sst_hsw *hsw, struct sst_hsw_stream *stream, u32 *position); int sst_hsw_stream_set_write_position(struct sst_hsw *hsw, struct sst_hsw_stream *stream, u32 stage_id, u32 position); -int sst_hsw_get_dsp_position(struct sst_hsw *hsw, +u32 sst_hsw_get_dsp_position(struct sst_hsw *hsw, + struct sst_hsw_stream *stream); +u64 sst_hsw_get_dsp_presentation_position(struct sst_hsw *hsw, struct sst_hsw_stream *stream); /* HW port config */ |