summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-06-15 02:25:17 +0200
committerMark Brown <broonie@kernel.org>2017-06-15 19:15:00 +0200
commit1fdb5d258e28de85263a34aab57f0a70b1715342 (patch)
treeee12fb402e4696863395d441cf15fb90593ff881
parentASoC: simple-card-utils: add asoc_simple_card_of_parse_routing() (diff)
downloadlinux-1fdb5d258e28de85263a34aab57f0a70b1715342.tar.xz
linux-1fdb5d258e28de85263a34aab57f0a70b1715342.zip
ASoC: simple-card: use asoc_simple_card_of_parse_routing()
Current simple/audio scu card drivers are supporting same routing on DT, but, doesn't use same function for it. Encapsulation is one of simple card util's purpose. Let's use asoc_simple_card_of_parse_routing Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/generic/simple-card.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 8b414af966ee..7b2533c7f82e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -362,13 +362,9 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
goto card_parse_end;
}
- /* DAPM routes */
- if (of_property_read_bool(node, PREFIX "routing")) {
- ret = snd_soc_of_parse_audio_routing(card,
- PREFIX "routing");
- if (ret)
- goto card_parse_end;
- }
+ ret = asoc_simple_card_of_parse_routing(card, PREFIX, 1);
+ if (ret < 0)
+ goto card_parse_end;
/* Factor to mclk, used in hw_params() */
of_property_read_u32(node, PREFIX "mclk-fs", &priv->mclk_fs);