summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-03-24 12:15:24 +0200
committerMark Brown <broonie@linaro.org>2014-04-23 13:14:27 +0100
commit389cb8348cf5ac4a702c71bf13673c4c8bf01e34 (patch)
tree7bf0e00cdc1290a186e99fec5130aea04e431d38 /include/sound
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
ASoC: core: Update snd_soc_of_parse_daifmt() interface
Adds struct device_node **bitclkmaster and struct device_node **framemaster function parameters. With the new syntax bitclock-master and frame-master properties can explicitly indicate the dai-link bit-clock and frame masters with a phandle. This patch also makes the minimal changes to simple-card for it to work with the updated snd_soc_of_parse_daifmt(). Simple-card appears to be the only user of snd_soc_of_parse_daifmt() for now. Signed-off-by: Jyri Sarha <jsarha@ti.com> Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0b83168d8ff4..58784105289a 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1241,7 +1241,9 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
const char *propname);
unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
- const char *prefix);
+ const char *prefix,
+ struct device_node **bitclkmaster,
+ struct device_node **framemaster);
int snd_soc_of_get_dai_name(struct device_node *of_node,
const char **dai_name);