samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

Revert "dsp: add workqueue for audio_prm and pinctrl_lpi"

Bladeren bron 
This reverts commit 8b3578665b as
it would cause NOC issue.
Move clk reset and snd_event_notify from PD notification to
ssr_enable function to make sure these are done after GPR is
up.

Change-Id: I784ad03093846434313967bcf18c946b3ef18bfc
Signed-off-by: Meng Wang <mengw@codeaurora.org>
This commit is contained in:
Meng Wang
2021-06-26 15:08:12 +08:00
bovenliggende f9c72af547
commit f01200e92b
2 gewijzigde bestanden met toevoegingen van 33 en 40 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

16
dsp/audio_prm.c
Bestand weergeven

@@ -30,7 +30,6 @@ struct audio_prm {
atomic_t state;
atomic_t status;
bool is_adsp_up;
struct work_struct reset_work;
};
static struct audio_prm g_prm;
@@ -307,13 +306,6 @@ int audio_prm_set_lpass_clk_cfg (struct clk_cfg *clk, uint8_t enable)
}
EXPORT_SYMBOL(audio_prm_set_lpass_clk_cfg);
static void audio_prm_adsp_work(struct work_struct *work)
{
mutex_lock(&g_prm.lock);
g_prm.is_adsp_up = true;
mutex_unlock(&g_prm.lock);
}
static int audio_prm_service_cb(struct notifier_block *this,
unsigned long opcode, void *data)
{
@@ -328,7 +320,9 @@ static int audio_prm_service_cb(struct notifier_block *this,
mutex_unlock(&g_prm.lock);
break;
case AUDIO_NOTIFIER_SERVICE_UP:
schedule_work(&g_prm.reset_work);
mutex_lock(&g_prm.lock);
g_prm.is_adsp_up = true;
mutex_unlock(&g_prm.lock);
break;
default:
break;
@@ -360,7 +354,6 @@ static int audio_prm_probe(struct gpr_device *adev)
init_waitqueue_head(&g_prm.wait);
g_prm.is_adsp_up = true;
INIT_WORK(&g_prm.reset_work, audio_prm_adsp_work);
pr_err("%s: prm probe success\n", __func__);
return ret;
}
@@ -373,9 +366,6 @@ static int audio_prm_remove(struct gpr_device *adev)
mutex_lock(&g_prm.lock);
g_prm.is_adsp_up = false;
g_prm.adev = NULL;
flush_work(&g_prm.reset_work);
cancel_work_sync(&g_prm.reset_work);
INIT_WORK(&g_prm.reset_work, NULL);
mutex_unlock(&g_prm.lock);
return ret;
}