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

Merge "asoc: wcd934x: add SSR events to trigger to new swr master controller"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-09-26 21:37:00 -07:00
committed by Gerrit - the friendly Code Review server
parent a984bd8837 d7262ae1e0
commit 649cf8acaa
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
asoc/codecs/wcd934x/wcd934x.c
View File

@@ -10010,9 +10010,13 @@ static int tavil_device_down(struct wcd9xxx *wcd9xxx)
(&priv->mbhc->wcd_mbhc, false); (&priv->mbhc->wcd_mbhc, false);
} }
if (priv->swr.ctrl_data) if (priv->swr.ctrl_data) {
if (is_snd_event_fwk_enabled())
swrm_wcd_notify(priv->swr.ctrl_data[0].swr_pdev,
SWR_DEVICE_SSR_DOWN, NULL);
swrm_wcd_notify(priv->swr.ctrl_data[0].swr_pdev, swrm_wcd_notify(priv->swr.ctrl_data[0].swr_pdev,
SWR_DEVICE_DOWN, NULL); SWR_DEVICE_DOWN, NULL);
}
tavil_dsd_reset(priv->dsd_config); tavil_dsd_reset(priv->dsd_config);
if (!is_snd_event_fwk_enabled()) if (!is_snd_event_fwk_enabled())
snd_soc_card_change_online_state(codec->component.card, 0); snd_soc_card_change_online_state(codec->component.card, 0);
@@ -10110,6 +10114,9 @@ static int tavil_post_reset_cb(struct wcd9xxx *wcd9xxx)
goto done; goto done;
} }
if (tavil->swr.ctrl_data && is_snd_event_fwk_enabled())
swrm_wcd_notify(tavil->swr.ctrl_data[0].swr_pdev,
SWR_DEVICE_SSR_UP, NULL);
tavil_set_spkr_mode(codec, tavil->swr.spkr_mode); tavil_set_spkr_mode(codec, tavil->swr.spkr_mode);
/* /*
* Once the codec initialization is completed, the svs vote * Once the codec initialization is completed, the svs vote