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

asoc: lpass-cdc: update logic to disable VA_MCLK

Browse Source 
When adsp SSR happens, VA_MCLK enabled by VA_SWR_PWR widget will
not be disabled as ADSP is down and it cannot enable TX_MCLk before
disabling VA_MCLK. After disabling SVA, VA_MCLk is left open.
Add dev_up flag to indicate SSR and close VA_MCLK during SSR.

Change-Id: Ic544ce32c46054c7362d3eb07a4a47ec115d2651
Signed-off-by: Meng Wang <mengw@codeaurora.org>
This commit is contained in:
Meng Wang
2021-08-17 11:15:20 +08:00
parent fa58ae98f9
commit f62a7f3e92
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
asoc/codecs/lpass-cdc/lpass-cdc-va-macro.c
View File

@@ -175,6 +175,7 @@ struct lpass_cdc_va_macro_priv {
bool wcd_dmic_enabled; bool wcd_dmic_enabled;
int dapm_tx_clk_status; int dapm_tx_clk_status;
u16 current_clk_id; u16 current_clk_id;
bool dev_up;
}; };
static bool lpass_cdc_va_macro_get_data(struct snd_soc_component *component, static bool lpass_cdc_va_macro_get_data(struct snd_soc_component *component,
@@ -344,6 +345,7 @@ static int lpass_cdc_va_macro_event_handler(struct snd_soc_component *component,
trace_printk("%s, enter SSR up\n", __func__); trace_printk("%s, enter SSR up\n", __func__);
/* reset swr after ssr/pdr */ /* reset swr after ssr/pdr */
va_priv->reset_swr = true; va_priv->reset_swr = true;
va_priv->dev_up = true;
if (va_priv->swr_ctrl_data) if (va_priv->swr_ctrl_data)
swrm_wcd_notify( swrm_wcd_notify(
va_priv->swr_ctrl_data[0].va_swr_pdev, va_priv->swr_ctrl_data[0].va_swr_pdev,
@@ -353,6 +355,7 @@ static int lpass_cdc_va_macro_event_handler(struct snd_soc_component *component,
lpass_cdc_rsc_clk_reset(va_dev, VA_CORE_CLK); lpass_cdc_rsc_clk_reset(va_dev, VA_CORE_CLK);
break; break;
case LPASS_CDC_MACRO_EVT_SSR_DOWN: case LPASS_CDC_MACRO_EVT_SSR_DOWN:
va_priv->dev_up = false;
if (va_priv->swr_ctrl_data) { if (va_priv->swr_ctrl_data) {
swrm_wcd_notify( swrm_wcd_notify(
va_priv->swr_ctrl_data[0].va_swr_pdev, va_priv->swr_ctrl_data[0].va_swr_pdev,
@@ -466,17 +469,16 @@ static int lpass_cdc_va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
} }
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
if (va_priv->current_clk_id == VA_CORE_CLK && if (va_priv->current_clk_id == VA_CORE_CLK) {
va_priv->va_swr_clk_cnt != 0 &&
va_priv->tx_clk_status) {
ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev, ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev,
va_priv->default_clk_id, va_priv->default_clk_id,
TX_CORE_CLK, TX_CORE_CLK,
true); true);
if (ret) { if (ret) {
dev_dbg(component->dev, dev_err(component->dev,
"%s: request clock TX_CLK enable failed\n", "%s: request clock TX_CLK enable failed\n",
__func__); __func__);
if (va_priv->dev_up)
break; break;
} }
ret = lpass_cdc_va_macro_core_vote(va_priv, true); ret = lpass_cdc_va_macro_core_vote(va_priv, true);
@@ -484,6 +486,7 @@ static int lpass_cdc_va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
dev_err(va_priv->dev, dev_err(va_priv->dev,
"%s: va request core vote failed\n", "%s: va request core vote failed\n",
__func__); __func__);
if (va_priv->dev_up)
break; break;
} }
ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev, ret = lpass_cdc_clk_rsc_request_clock(va_priv->dev,
@@ -492,9 +495,10 @@ static int lpass_cdc_va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
false); false);
lpass_cdc_va_macro_core_vote(va_priv, false); lpass_cdc_va_macro_core_vote(va_priv, false);
if (ret) { if (ret) {
dev_dbg(component->dev, dev_err(component->dev,
"%s: request clock VA_CLK disable failed\n", "%s: request clock VA_CLK disable failed\n",
__func__); __func__);
if (va_priv->dev_up)
lpass_cdc_clk_rsc_request_clock(va_priv->dev, lpass_cdc_clk_rsc_request_clock(va_priv->dev,
va_priv->default_clk_id, va_priv->default_clk_id,
TX_CORE_CLK, TX_CORE_CLK,
@@ -2135,6 +2139,8 @@ static int lpass_cdc_va_macro_init(struct snd_soc_component *component)
snd_soc_dapm_ignore_suspend(dapm, "VA SWR_INPUT"); snd_soc_dapm_ignore_suspend(dapm, "VA SWR_INPUT");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
va_priv->dev_up = true;
for (i = 0; i < LPASS_CDC_VA_MACRO_NUM_DECIMATORS; i++) { for (i = 0; i < LPASS_CDC_VA_MACRO_NUM_DECIMATORS; i++) {
va_priv->va_hpf_work[i].va_priv = va_priv; va_priv->va_hpf_work[i].va_priv = va_priv;
va_priv->va_hpf_work[i].decimator = i; va_priv->va_hpf_work[i].decimator = i;