diff options
| author | Mark Brown | 2018-09-03 15:37:28 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-09-03 15:37:28 +0200 |
| commit | d47f9580a6ea82b80c34c9dbc9dd8dba6bb25dc0 (patch) | |
| tree | 54d90ae2ad5f627e9909282546a3cfc7c4d33b7b /sound/soc/sh/rcar/rsnd.h | |
| parent | ASoC: rsnd: ssiu: Support to init different BUSIF instance (diff) | |
| parent | ASoC: rsnd: fixup not to call clk_get/set under non-atomic (diff) | |
| download | kernel-qcow2-linux-d47f9580a6ea82b80c34c9dbc9dd8dba6bb25dc0.tar.gz kernel-qcow2-linux-d47f9580a6ea82b80c34c9dbc9dd8dba6bb25dc0.tar.xz kernel-qcow2-linux-d47f9580a6ea82b80c34c9dbc9dd8dba6bb25dc0.zip | |
Merge branch 'asoc-4.19' into asoc-4.20 for rcar dep
Diffstat (limited to 'sound/soc/sh/rcar/rsnd.h')
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 7ff58b0e8002..7a04b19e405c 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -301,6 +301,9 @@ struct rsnd_mod_ops { int (*nolock_stop)(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv); + int (*prepare)(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv); }; struct rsnd_dai_stream; @@ -330,6 +333,7 @@ struct rsnd_mod { * H 0: fallback * H 0: hw_params * H 0: pointer + * H 0: prepare */ #define __rsnd_mod_shift_nolock_start 0 #define __rsnd_mod_shift_nolock_stop 0 @@ -344,6 +348,7 @@ struct rsnd_mod { #define __rsnd_mod_shift_fallback 28 /* always called */ #define __rsnd_mod_shift_hw_params 28 /* always called */ #define __rsnd_mod_shift_pointer 28 /* always called */ +#define __rsnd_mod_shift_prepare 28 /* always called */ #define __rsnd_mod_add_probe 0 #define __rsnd_mod_add_remove 0 @@ -358,6 +363,7 @@ struct rsnd_mod { #define __rsnd_mod_add_fallback 0 #define __rsnd_mod_add_hw_params 0 #define __rsnd_mod_add_pointer 0 +#define __rsnd_mod_add_prepare 0 #define __rsnd_mod_call_probe 0 #define __rsnd_mod_call_remove 0 @@ -372,6 +378,7 @@ struct rsnd_mod { #define __rsnd_mod_call_pointer 0 #define __rsnd_mod_call_nolock_start 0 #define __rsnd_mod_call_nolock_stop 1 +#define __rsnd_mod_call_prepare 0 #define rsnd_mod_to_priv(mod) ((mod)->priv) #define rsnd_mod_name(mod) ((mod)->ops->name) |