evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoc: wcd934x-dsp-cntl: notify online event after clocks are disabled"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-21 00:20:00 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6afe3a8c3b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/soc/codecs/wcd934x/wcd934x-dsp-cntl.c
View file

@ -763,10 +763,6 @@ static int wcd_control_handler(struct device *dev, void *priv_data,
case WDSP_EVENT_DLOAD_FAILED: case WDSP_EVENT_DLOAD_FAILED:
case WDSP_EVENT_POST_SHUTDOWN: case WDSP_EVENT_POST_SHUTDOWN:
if (event == WDSP_EVENT_POST_DLOAD_CODE)
/* Mark DSP online since code download is complete */
wcd_cntl_change_online_state(cntl, 1);
/* Disable CPAR */ /* Disable CPAR */
wcd_cntl_cpar_ctrl(cntl, false); wcd_cntl_cpar_ctrl(cntl, false);
/* Disable all the clocks */ /* Disable all the clocks */
@ -775,6 +771,11 @@ static int wcd_control_handler(struct device *dev, void *priv_data,
dev_err(codec->dev, dev_err(codec->dev,
"%s: Failed to disable clocks, err = %d\n", "%s: Failed to disable clocks, err = %d\n",
__func__, ret); __func__, ret);
if (event == WDSP_EVENT_POST_DLOAD_CODE)
/* Mark DSP online since code download is complete */
wcd_cntl_change_online_state(cntl, 1);
break; break;
case WDSP_EVENT_PRE_DLOAD_DATA: case WDSP_EVENT_PRE_DLOAD_DATA: