diff options
author | Jyri Sarha <jsarha@ti.com> | 2014-03-24 06:15:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-23 08:14:27 -0400 |
commit | 389cb8348cf5ac4a702c71bf13673c4c8bf01e34 (patch) | |
tree | 7bf0e00cdc1290a186e99fec5130aea04e431d38 /include/sound | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (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.h | 4 |
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, | |||
1241 | int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, | 1241 | int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, |
1242 | const char *propname); | 1242 | const char *propname); |
1243 | unsigned int snd_soc_of_parse_daifmt(struct device_node *np, | 1243 | unsigned int snd_soc_of_parse_daifmt(struct device_node *np, |
1244 | const char *prefix); | 1244 | const char *prefix, |
1245 | struct device_node **bitclkmaster, | ||
1246 | struct device_node **framemaster); | ||
1245 | int snd_soc_of_get_dai_name(struct device_node *of_node, | 1247 | int snd_soc_of_get_dai_name(struct device_node *of_node, |
1246 | const char **dai_name); | 1248 | const char **dai_name); |
1247 | 1249 | ||