summaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
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 /sound/soc/generic
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
downloadop-kernel-dev-389cb8348cf5ac4a702c71bf13673c4c8bf01e34.zip
op-kernel-dev-389cb8348cf5ac4a702c71bf13673c4c8bf01e34.tar.gz
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 'sound/soc/generic')
-rw-r--r--sound/soc/generic/simple-card.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 21f1ccb..835fd02 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -121,7 +121,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
* bitclock-master, frame-master
* and specific "format" if it has
*/
- dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
+ dai->fmt = snd_soc_of_parse_daifmt(np, NULL, NULL, NULL);
dai->fmt |= daifmt;
/*
@@ -201,7 +201,8 @@ static int asoc_simple_card_parse_of(struct device_node *node,
snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
/* get CPU/CODEC common format via simple-audio-card,format */
- daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
+ daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,", NULL,
+ NULL) &
(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
/* off-codec widgets */
OpenPOWER on IntegriCloud