duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: va-macro: Update widget order for VA_MCLK and VA_SWR_PWR

Browse Source 
Update widget order for widgets VA_MCLK and VA_SWR_PWR.
As both are having widget supply priority -1, sometimes
dapm is triggering both widget callbacks simultaneously
causing race condition in handling the SWR clock release
with proper request for VA_CLK instead of TX_CLK and
next usecase powerup is impacted.

Change-Id: I3d3a3fadcdb897287ad070dc9e81e354c6f970b0
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
This commit is contained in:
Laxminath Kasam authored and Gerrit - the friendly Code Review server committed 2020-09-28 01:05:54 -07:00
1 parent d5bff1117f
commit 1e7a9df19f
1 file changed
+2 -19
Download Patch File Download Diff File Expand all files Collapse all files
asoc/codecs/bolero/va-macro.c
+2 -19
View File
@@ -509,7 +509,6 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w,
int ret = 0;
struct device *va_dev = NULL;
struct va_macro_priv *va_priv = NULL;
int clk_src = 0;
if (!va_macro_get_data(component, &va_dev, &va_priv, __func__))
return -EINVAL;
@@ -531,22 +530,6 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w,
break;
case SND_SOC_DAPM_POST_PMD:
if (va_priv->lpi_enable) {
if (va_priv->version == BOLERO_VERSION_2_1) {
if (va_priv->swr_ctrl_data) {
clk_src = CLK_SRC_TX_RCG;
ret = swrm_wcd_notify(
va_priv->swr_ctrl_data[0].va_swr_pdev,
SWR_REQ_CLK_SWITCH, &clk_src);
if (ret)
dev_dbg(va_dev,
"%s: clock switch failed\n",
__func__);
}
} else if (bolero_tx_clk_switch(component,
CLK_SRC_TX_RCG)) {
dev_dbg(va_dev, "%s: clock switch failed\n",
__func__);
}
va_macro_mclk_enable(va_priv, 0, true);
} else {
bolero_tx_mclk_enable(component, 0);
@@ -1919,7 +1902,7 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_v2[] = {
VA_MACRO_AIF3_CAP, 0,
va_aif3_cap_mixer_v2, ARRAY_SIZE(va_aif3_cap_mixer_v2)),
SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -1, SND_SOC_NOPM, 0, 0,
SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -2, SND_SOC_NOPM, 0, 0,
va_macro_swr_pwr_event_v2,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -1961,7 +1944,7 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_v3[] = {
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -1, SND_SOC_NOPM, 0, 0,
SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -2, SND_SOC_NOPM, 0, 0,
va_macro_swr_pwr_event,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
};