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

soc: swr-mstr: Enable device wakeup only for tx macro

Browse Source 
At bootup device wakeup enable is called for all masters
causing issue for wsa. This is because wsa
supports interrupts. Thus enable device wakeup
only for tx master.

Propagated this change from previous target.

Change-Id: Iade70defc599952b77b664b752cc55570b4aed27
Signed-off-by: Junkai Cai <junkai@codeaurora.org>
This commit is contained in:
Junkai Cai
2021-08-21 16:06:34 -07:00
parent 1f7c8acba3
commit 16acb739c4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2937,8 +2937,14 @@ static int swrm_probe(struct platform_device *pdev)
if (ret) if (ret)
dev_dbg(swrm->dev, "%s: swrm irq wakeup capable not defined\n", dev_dbg(swrm->dev, "%s: swrm irq wakeup capable not defined\n",
__func__); __func__);
if (swrm->swr_irq_wakeup_capable) if (swrm->swr_irq_wakeup_capable) {
irq_set_irq_wake(swrm->irq, 1); irq_set_irq_wake(swrm->irq, 1);
ret = device_init_wakeup(swrm->dev, true);
if (ret)
dev_info(swrm->dev,
"%s: Device wakeup init failed: %d\n",
__func__, ret);
}
ret = swr_register_master(&swrm->master); ret = swr_register_master(&swrm->master);
if (ret) { if (ret) {
dev_err(&pdev->dev, "%s: error adding swr master\n", __func__); dev_err(&pdev->dev, "%s: error adding swr master\n", __func__);
@@ -3022,12 +3028,6 @@ static int swrm_probe(struct platform_device *pdev)
&swrm_debug_dump_ops); &swrm_debug_dump_ops);
} }
#endif #endif
ret = device_init_wakeup(swrm->dev, true);
if (ret) {
dev_err(swrm->dev, "Device wakeup init failed: %d\n", ret);
goto err_irq_wakeup_fail;
}
pm_runtime_set_autosuspend_delay(&pdev->dev, auto_suspend_timer); pm_runtime_set_autosuspend_delay(&pdev->dev, auto_suspend_timer);
pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_set_active(&pdev->dev); pm_runtime_set_active(&pdev->dev);
@@ -3039,11 +3039,10 @@ static int swrm_probe(struct platform_device *pdev)
//msm_aud_evt_register_client(&swrm->event_notifier); //msm_aud_evt_register_client(&swrm->event_notifier);
return 0; return 0;
err_irq_wakeup_fail:
device_init_wakeup(swrm->dev, false);
err_parse_num_dev: err_parse_num_dev:
err_mstr_init_fail: err_mstr_init_fail:
swr_unregister_master(&swrm->master); swr_unregister_master(&swrm->master);
device_init_wakeup(swrm->dev, false);
err_mstr_fail: err_mstr_fail:
if (swrm->reg_irq) { if (swrm->reg_irq) {
swrm->reg_irq(swrm->handle, swr_mstr_interrupt, swrm->reg_irq(swrm->handle, swr_mstr_interrupt,
@@ -3085,8 +3084,10 @@ static int swrm_remove(struct platform_device *pdev)
irqd_set_trigger_type( irqd_set_trigger_type(
irq_get_irq_data(swrm->irq), irq_get_irq_data(swrm->irq),
IRQ_TYPE_NONE); IRQ_TYPE_NONE);
if (swrm->swr_irq_wakeup_capable) if (swrm->swr_irq_wakeup_capable) {
irq_set_irq_wake(swrm->irq, 0); irq_set_irq_wake(swrm->irq, 0);
device_init_wakeup(swrm->dev, false);
}
free_irq(swrm->irq, swrm); free_irq(swrm->irq, swrm);
} else if (swrm->wake_irq > 0) { } else if (swrm->wake_irq > 0) {
free_irq(swrm->wake_irq, swrm); free_irq(swrm->wake_irq, swrm);
@@ -3096,7 +3097,6 @@ static int swrm_remove(struct platform_device *pdev)
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
swr_unregister_master(&swrm->master); swr_unregister_master(&swrm->master);
//msm_aud_evt_unregister_client(&swrm->event_notifier); //msm_aud_evt_unregister_client(&swrm->event_notifier);
device_init_wakeup(swrm->dev, false);
mutex_destroy(&swrm->irq_lock); mutex_destroy(&swrm->irq_lock);
mutex_destroy(&swrm->mlock); mutex_destroy(&swrm->mlock);
mutex_destroy(&swrm->reslock); mutex_destroy(&swrm->reslock);