diff options
| author | Mark Brown <broonie@kernel.org> | 2017-05-24 18:44:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-24 18:44:06 +0100 |
| commit | 7932787f03f33493455360df936d10d0d04fc7c5 (patch) | |
| tree | 2fb5d0369906eb1ad0a00f3d3a45b25cb4620645 /include/sound | |
| parent | 55cfebfede61cedf60289a7bd20e93a1c83a39a9 (diff) | |
| parent | a180e8b988437b3e84a1b501ac4d073467602ca6 (diff) | |
| download | lwn-7932787f03f33493455360df936d10d0d04fc7c5.tar.gz lwn-7932787f03f33493455360df936d10d0d04fc7c5.zip | |
Merge branch 'topic/dai-id' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-of-graph
Diffstat (limited to 'include/sound')
| -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, |