diff options
author | Mark Brown <broonie@kernel.org> | 2017-07-03 17:51:30 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-03 17:51:30 +0200 |
commit | 6bf4cd287d6e60755481940386b3d146f7ba3c92 (patch) | |
tree | 5254f97b9ab497417d5484b64177e480ffbb3914 /include/sound/soc.h | |
parent | Merge remote-tracking branch 'asoc/topic/intel' into asoc-next (diff) | |
parent | ASoC: rsnd: make arrays path and cmd_case static const (diff) | |
download | linux-6bf4cd287d6e60755481940386b3d146f7ba3c92.tar.xz linux-6bf4cd287d6e60755481940386b3d146f7ba3c92.zip |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5170fd81e1fd..9c94b97c17f8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -803,6 +803,8 @@ struct snd_soc_component_driver { int (*of_xlate_dai_name)(struct snd_soc_component *component, struct of_phandle_args *args, const char **dai_name); + int (*of_xlate_dai_id)(struct snd_soc_component *comment, + struct device_node *endpoint); void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type, int subseq); int (*stream_event)(struct snd_soc_component *, int event); @@ -1676,6 +1678,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, const char *prefix, struct device_node **bitclkmaster, struct device_node **framemaster); +int snd_soc_get_dai_id(struct device_node *ep); int snd_soc_get_dai_name(struct of_phandle_args *args, const char **dai_name); int snd_soc_of_get_dai_name(struct device_node *of_node, |