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

Merge "ASoC: msm_sdw: Fix random mute on speaker when device switch"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-23 09:44:34 -07:00 • committed by Gerrit - the friendly Code Review server
commit 50c5bf4a56
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/codecs/msm_sdw/msm_sdw_cdc.c
View file

@ -1044,7 +1044,7 @@ static int msm_sdw_swrm_read(void *handle, int reg)
* Add sleep as SWR slave access read takes time. * Add sleep as SWR slave access read takes time.
* Allow for RD_DONE to complete for previous register if any. * Allow for RD_DONE to complete for previous register if any.
*/ */
usleep_range(50, 55); usleep_range(100, 105);
/* read_lock */ /* read_lock */
mutex_lock(&msm_sdw->sdw_read_lock); mutex_lock(&msm_sdw->sdw_read_lock);
@ -1079,6 +1079,11 @@ static int msm_sdw_bulk_write(struct msm_sdw_priv *msm_sdw,
sdw_wr_addr_base = MSM_SDW_AHB_BRIDGE_WR_ADDR_0; sdw_wr_addr_base = MSM_SDW_AHB_BRIDGE_WR_ADDR_0;
sdw_wr_data_base = MSM_SDW_AHB_BRIDGE_WR_DATA_0; sdw_wr_data_base = MSM_SDW_AHB_BRIDGE_WR_DATA_0;
/*
* Add sleep as SWR slave write takes time.
* Allow for any previous pending write to complete.
*/
usleep_range(50, 55);
for (i = 0; i < len; i += 2) { for (i = 0; i < len; i += 2) {
/* First Write the Data to register */ /* First Write the Data to register */
ret = regmap_bulk_write(msm_sdw->regmap, ret = regmap_bulk_write(msm_sdw->regmap,