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

Merge "soundwire: Vote for LPASS HW Core before soundwire register access"

Browse Source
This commit is contained in:
qctecmdr
2019-04-14 23:16:15 -07:00
committed by Gerrit - the friendly Code Review server
parent f082bd8110 66d6fd1364
commit 553c49490a
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1441,6 +1441,8 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev)
} }
mutex_lock(&swrm->reslock); mutex_lock(&swrm->reslock);
if (swrm->lpass_core_hw_vote)
clk_prepare_enable(swrm->lpass_core_hw_vote);
swrm_clk_request(swrm, true); swrm_clk_request(swrm, true);
mutex_unlock(&swrm->reslock); mutex_unlock(&swrm->reslock);
@@ -1608,6 +1610,8 @@ handle_irq:
mutex_lock(&swrm->reslock); mutex_lock(&swrm->reslock);
swrm_clk_request(swrm, false); swrm_clk_request(swrm, false);
if (swrm->lpass_core_hw_vote)
clk_disable_unprepare(swrm->lpass_core_hw_vote);
mutex_unlock(&swrm->reslock); mutex_unlock(&swrm->reslock);
swrm_unlock_sleep(swrm); swrm_unlock_sleep(swrm);
return ret; return ret;
@@ -1897,6 +1901,7 @@ static int swrm_probe(struct platform_device *pdev)
u32 i, num_ports, port_num, port_type, ch_mask; u32 i, num_ports, port_num, port_type, ch_mask;
u32 *temp, map_size, map_length, ch_iter = 0, old_port_num = 0; u32 *temp, map_size, map_length, ch_iter = 0, old_port_num = 0;
int ret = 0; int ret = 0;
struct clk *lpass_core_hw_vote = NULL;
/* Allocate soundwire master driver structure */ /* Allocate soundwire master driver structure */
swrm = devm_kzalloc(&pdev->dev, sizeof(struct swr_mstr_ctrl), swrm = devm_kzalloc(&pdev->dev, sizeof(struct swr_mstr_ctrl),
@@ -2145,6 +2150,17 @@ static int swrm_probe(struct platform_device *pdev)
if (pdev->dev.of_node) if (pdev->dev.of_node)
of_register_swr_devices(&swrm->master); of_register_swr_devices(&swrm->master);
/* Register LPASS core hw vote */
lpass_core_hw_vote = devm_clk_get(&pdev->dev, "lpass_core_hw_vote");
if (IS_ERR(lpass_core_hw_vote)) {
ret = PTR_ERR(lpass_core_hw_vote);
dev_dbg(&pdev->dev, "%s: clk get %s failed %d\n",
__func__, "lpass_core_hw_vote", ret);
lpass_core_hw_vote = NULL;
ret = 0;
}
swrm->lpass_core_hw_vote = lpass_core_hw_vote;
dbgswrm = swrm; dbgswrm = swrm;
debugfs_swrm_dent = debugfs_create_dir(dev_name(&pdev->dev), 0); debugfs_swrm_dent = debugfs_create_dir(dev_name(&pdev->dev), 0);
if (!IS_ERR(debugfs_swrm_dent)) { if (!IS_ERR(debugfs_swrm_dent)) {
@@ -2257,6 +2273,12 @@ static int swrm_runtime_resume(struct device *dev)
__func__, swrm->state); __func__, swrm->state);
mutex_lock(&swrm->reslock); mutex_lock(&swrm->reslock);
if (swrm->lpass_core_hw_vote)
ret = clk_prepare_enable(swrm->lpass_core_hw_vote);
if (ret < 0)
dev_err(dev, "%s:lpass core hw enable failed\n",
__func__);
if ((swrm->state == SWR_MSTR_DOWN) || if ((swrm->state == SWR_MSTR_DOWN) ||
(swrm->state == SWR_MSTR_SSR && swrm->dev_up)) { (swrm->state == SWR_MSTR_SSR && swrm->dev_up)) {
if (swrm->clk_stop_mode0_supp) { if (swrm->clk_stop_mode0_supp) {
@@ -2293,6 +2315,8 @@ static int swrm_runtime_resume(struct device *dev)
swrm->state = SWR_MSTR_UP; swrm->state = SWR_MSTR_UP;
} }
exit: exit:
if (swrm->lpass_core_hw_vote)
clk_disable_unprepare(swrm->lpass_core_hw_vote);
pm_runtime_set_autosuspend_delay(&pdev->dev, auto_suspend_timer); pm_runtime_set_autosuspend_delay(&pdev->dev, auto_suspend_timer);
mutex_unlock(&swrm->reslock); mutex_unlock(&swrm->reslock);
return ret; return ret;
@@ -2313,6 +2337,12 @@ static int swrm_runtime_suspend(struct device *dev)
mutex_lock(&swrm->force_down_lock); mutex_lock(&swrm->force_down_lock);
current_state = swrm->state; current_state = swrm->state;
mutex_unlock(&swrm->force_down_lock); mutex_unlock(&swrm->force_down_lock);
if (swrm->lpass_core_hw_vote)
ret = clk_prepare_enable(swrm->lpass_core_hw_vote);
if (ret < 0)
dev_err(dev, "%s:lpass core hw enable failed\n",
__func__);
if ((current_state == SWR_MSTR_UP) || if ((current_state == SWR_MSTR_UP) ||
(current_state == SWR_MSTR_SSR)) { (current_state == SWR_MSTR_SSR)) {
@@ -2358,6 +2388,8 @@ static int swrm_runtime_suspend(struct device *dev)
if (current_state != SWR_MSTR_SSR) if (current_state != SWR_MSTR_SSR)
swrm->state = SWR_MSTR_DOWN; swrm->state = SWR_MSTR_DOWN;
exit: exit:
if (swrm->lpass_core_hw_vote)
clk_disable_unprepare(swrm->lpass_core_hw_vote);
mutex_unlock(&swrm->reslock); mutex_unlock(&swrm->reslock);
return ret; return ret;
} }

1
soc/swr-mstr-ctrl.h
View File

@@ -154,6 +154,7 @@ struct swr_mstr_ctrl {
int wlock_holders; int wlock_holders;
u32 intr_mask; u32 intr_mask;
struct port_params **port_param; struct port_params **port_param;
struct clk *lpass_core_hw_vote;
u8 num_usecase; u8 num_usecase;
u32 swr_irq_wakeup_capable; u32 swr_irq_wakeup_capable;
}; };