diff mbox

[25/49] ASoC: simple-card: use asoc_simple_card_parse_card_route()

Message ID 87k2ipqct0.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Kuninori Morimoto May 20, 2016, 9:55 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/generic/simple-card.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index a85245c..5b2559a 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -361,14 +361,6 @@  static int asoc_simple_card_parse_of(struct device_node *node,
 			return ret;
 	}
 
-	/* DAPM routes */
-	if (of_property_read_bool(node, "simple-audio-card,routing")) {
-		ret = snd_soc_of_parse_audio_routing(&priv->snd_card,
-					"simple-audio-card,routing");
-		if (ret)
-			return ret;
-	}
-
 	/* Factor to mclk, used in hw_params() */
 	ret = of_property_read_u32(node, "simple-audio-card,mclk-fs", &val);
 	if (ret == 0)
@@ -408,6 +400,10 @@  static int asoc_simple_card_parse_of(struct device_node *node,
 	if (priv->gpio_mic_det == -EPROBE_DEFER)
 		return -EPROBE_DEFER;
 
+	ret = asoc_simple_card_parse_card_route(card, PREFIX);
+	if (ret)
+		return ret;
+
 	ret = asoc_simple_card_parse_card_name(card, PREFIX);
 	if (ret)
 		return ret;