samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: sm6150: Fix MCLK enable/disable sequence in MI2S slave mode

Browse Source 
Set enable/disable flag properly before sending the clk request
to ADSP in MI2S slave mode.

Change-Id: I4a145b1765b19b2eb708a52a35b51032f540fb2d
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
This commit is contained in:
Aditya Bavanari
2019-05-28 10:34:56 +05:30
committed by Gerrit - the friendly Code Review server
parent c63ec8cd8f
commit d92c7df9d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asoc/sm6150.c
View File

@@ -5928,6 +5928,7 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
if (mi2s_intf_conf[index].msm_is_ext_mclk) { if (mi2s_intf_conf[index].msm_is_ext_mclk) {
pr_debug("%s: Enabling mclk, clk_freq_in_hz = %u\n", pr_debug("%s: Enabling mclk, clk_freq_in_hz = %u\n",
__func__, mi2s_mclk[index].clk_freq_in_hz); __func__, mi2s_mclk[index].clk_freq_in_hz);
mi2s_mclk[index].enable = 1;
ret = afe_set_lpass_clock_v2(port_id, ret = afe_set_lpass_clock_v2(port_id,
&mi2s_mclk[index]); &mi2s_mclk[index]);
if (ret < 0) { if (ret < 0) {
@@ -5935,7 +5936,6 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
__func__, ret); __func__, ret);
goto clk_off; goto clk_off;
} }
mi2s_mclk[index].enable = 1;
} }
if (pdata->mi2s_gpio_p[index]) if (pdata->mi2s_gpio_p[index])
msm_cdc_pinctrl_select_active_state( msm_cdc_pinctrl_select_active_state(
@@ -5988,12 +5988,12 @@ static void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
if (mi2s_intf_conf[index].msm_is_ext_mclk) { if (mi2s_intf_conf[index].msm_is_ext_mclk) {
pr_debug("%s: Disabling mclk, clk_freq_in_hz = %u\n", pr_debug("%s: Disabling mclk, clk_freq_in_hz = %u\n",
__func__, mi2s_mclk[index].clk_freq_in_hz); __func__, mi2s_mclk[index].clk_freq_in_hz);
mi2s_mclk[index].enable = 0;
ret = afe_set_lpass_clock_v2(port_id, ret = afe_set_lpass_clock_v2(port_id,
&mi2s_mclk[index]); &mi2s_mclk[index]);
if (ret < 0) if (ret < 0)
pr_err("%s: mclk disable failed for MCLK (%d); ret=%d\n", pr_err("%s: mclk disable failed for MCLK (%d); ret=%d\n",
__func__, index, ret); __func__, index, ret);
mi2s_mclk[index].enable = 0;
} }
} }
mutex_unlock(&mi2s_intf_conf[index].lock); mutex_unlock(&mi2s_intf_conf[index].lock);