commit 5b8e7a4ac05360e59290ecad284d96b1e302cf4c
author Linux Build Service Account <lnxbuild@quicinc.com> Wed Jul 05 04:52:25 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 05 04:52:25 2017 -0700
tree 0b5b57da67b87715af2b5fc4a47564f8a86f6508
parent acbedfa2d7fde685172cdabf86ae2139b54049a1
parent 1f233cd141d259cf1b51a15e6da4b8142ac96217

Merge "ASoC: audio-ext-clk: enable pinctrl after clock enable"

sound/soc/codecs/audio-ext-clk-up.c

diff --git a/sound/soc/codecs/audio-ext-clk-up.c b/sound/soc/codecs/audio-ext-clk-up.c
index 3b54096..31c063d 100644
--- a/sound/soc/codecs/audio-ext-clk-up.c
+++ b/sound/soc/codecs/audio-ext-clk-up.c
@@ -177,6 +177,15 @@
 	struct pinctrl_info *pnctrl_info = &audio_lpass_mclk->pnctrl_info;
 	int ret;
 
+	lpass_mclk.enable = 1;
+	ret = afe_set_lpass_clock_v2(AFE_PORT_ID_PRIMARY_MI2S_RX,
+				&lpass_mclk);
+	if (ret < 0) {
+		pr_err("%s afe_set_digital_codec_core_clock failed\n",
+			__func__);
+		return ret;
+	}
+
 	if (pnctrl_info->pinctrl) {
 		ret = pinctrl_select_state(pnctrl_info->pinctrl,
 				pnctrl_info->active);
@@ -187,15 +196,6 @@
 		}
 	}
 
-	lpass_mclk.enable = 1;
-	ret = afe_set_lpass_clock_v2(AFE_PORT_ID_PRIMARY_MI2S_RX,
-				&lpass_mclk);
-	if (ret < 0) {
-		pr_err("%s afe_set_digital_codec_core_clock failed\n",
-			__func__);
-		return ret;
-	}
-
 	if (pnctrl_info->base)
 		iowrite32(1, pnctrl_info->base);
 	return 0;