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

Merge "soc: soundwire: Avoid bus clash during clock stop"

Browse Source
This commit is contained in:
qctecmdr
2019-11-21 08:43:06 -08:00
committed by Gerrit - the friendly Code Review server
parent 458e1f1e14 55fa597e30
commit 4faacac8ab
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
soc/swr-mstr-ctrl.c
View File

@@ -2738,6 +2738,14 @@ static int swrm_runtime_resume(struct device *dev)
} else { } else {
/*wake up from clock stop*/ /*wake up from clock stop*/
swr_master_write(swrm, SWRM_MCP_BUS_CTRL_ADDR, 0x2); swr_master_write(swrm, SWRM_MCP_BUS_CTRL_ADDR, 0x2);
/* clear and enable bus clash interrupt */
swr_master_write(swrm, SWRM_INTERRUPT_CLEAR, 0x08);
swrm->intr_mask |= 0x08;
swr_master_write(swrm, SWRM_INTERRUPT_MASK_ADDR,
swrm->intr_mask);
swr_master_write(swrm,
SWR_MSTR_RX_SWRM_CPU_INTERRUPT_EN,
swrm->intr_mask);
usleep_range(100, 105); usleep_range(100, 105);
if (!swrm_check_link_status(swrm, 0x1)) if (!swrm_check_link_status(swrm, 0x1))
goto exit; goto exit;
@@ -2819,6 +2827,13 @@ static int swrm_runtime_suspend(struct device *dev)
} }
} }
} else { } else {
/* Mask bus clash interrupt */
swrm->intr_mask &= ~((u32)0x08);
swr_master_write(swrm, SWRM_INTERRUPT_MASK_ADDR,
swrm->intr_mask);
swr_master_write(swrm,
SWR_MSTR_RX_SWRM_CPU_INTERRUPT_EN,
swrm->intr_mask);
mutex_unlock(&swrm->reslock); mutex_unlock(&swrm->reslock);
/* clock stop sequence */ /* clock stop sequence */
swrm_cmd_fifo_wr_cmd(swrm, 0x2, 0xF, 0xF, swrm_cmd_fifo_wr_cmd(swrm, 0x2, 0xF, 0xF,