summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 19:35:41 +0300
committerMark Brown <broonie@kernel.org>2017-02-19 19:35:41 +0300
commit4ae8be8ea9f7b46f339b8481c265256ffd412567 (patch)
tree4c296a7ed3919a05e9a786945e5c62a336e4f95a /include/sound
parent39bc30f25329ad16d67760581183ab7828f495cc (diff)
parent96241bae08f63e40dad8f3764e332858b27ba23c (diff)
downloadlinux-4ae8be8ea9f7b46f339b8481c265256ffd412567.tar.xz
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index b86168a21d56..5ab2e7e090c8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -507,9 +507,6 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
const struct snd_pcm_hardware *hw);
-int snd_soc_platform_trigger(struct snd_pcm_substream *substream,
- int cmd, struct snd_soc_platform *platform);
-
int soc_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai);
@@ -785,6 +782,10 @@ struct snd_soc_component_driver {
int (*suspend)(struct snd_soc_component *);
int (*resume)(struct snd_soc_component *);
+ /* pcm creation and destruction */
+ int (*pcm_new)(struct snd_soc_pcm_runtime *);
+ void (*pcm_free)(struct snd_pcm *);
+
/* DT */
int (*of_xlate_dai_name)(struct snd_soc_component *component,
struct of_phandle_args *args,
@@ -859,6 +860,8 @@ struct snd_soc_component {
void (*remove)(struct snd_soc_component *);
int (*suspend)(struct snd_soc_component *);
int (*resume)(struct snd_soc_component *);
+ int (*pcm_new)(struct snd_soc_pcm_runtime *);
+ void (*pcm_free)(struct snd_pcm *);
/* machine specific init */
int (*init)(struct snd_soc_component *component);
@@ -941,20 +944,11 @@ struct snd_soc_platform_driver {
int (*pcm_new)(struct snd_soc_pcm_runtime *);
void (*pcm_free)(struct snd_pcm *);
- /*
- * For platform caused delay reporting.
- * Optional.
- */
- snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
- struct snd_soc_dai *);
-
/* platform stream pcm ops */
const struct snd_pcm_ops *ops;
/* platform stream compress ops */
const struct snd_compr_ops *compr_ops;
-
- int (*bespoke_trigger)(struct snd_pcm_substream *, int);
};
struct snd_soc_dai_link_component {