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

asoc: wcd938x: stop mbhc during ssr down

Browse Source 
Stop mbhc operations during ssr down to cancel
any pending detection sequences.

Change-Id: Iff054cf8b3099959a1be561bd937057258f57b81
Signed-off-by: Meng Wang <mengw@codeaurora.org>
This commit is contained in:
Meng Wang
2019-04-01 18:12:06 +08:00
parent b1a49c6b67
commit 281bd20437
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
asoc/codecs/wcd938x/wcd938x-mbhc.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
#include <linux/init.h>
@@ -956,6 +956,31 @@ void wcd938x_mbhc_hs_detect_exit(struct snd_soc_component *component)
}
EXPORT_SYMBOL(wcd938x_mbhc_hs_detect_exit);
/*
* wcd938x_mbhc_ssr_down: stop mbhc during
* wcd938x subsystem restart
* mbhc: pointer to wcd937x_mbhc structure
* component: handle to snd_soc_component *
*/
void wcd938x_mbhc_ssr_down(struct wcd938x_mbhc *mbhc,
struct snd_soc_component *component)
{
struct wcd_mbhc *wcd_mbhc = NULL;
if (!mbhc || !component)
return;
wcd_mbhc = &mbhc->wcd_mbhc;
if (!wcd_mbhc) {
dev_err(component->dev, "%s: wcd_mbhc is NULL\n", __func__);
return;
}
wcd938x_mbhc_hs_detect_exit(component);
wcd_mbhc_deinit(wcd_mbhc);
}
EXPORT_SYMBOL(wcd938x_mbhc_ssr_down);
/*
* wcd938x_mbhc_post_ssr_init: initialize mbhc for
* wcd938x post subsystem restart
@@ -979,7 +1004,6 @@ int wcd938x_mbhc_post_ssr_init(struct wcd938x_mbhc *mbhc,
return -EINVAL;
}
wcd_mbhc_deinit(wcd_mbhc);
ret = wcd_mbhc_init(wcd_mbhc, component, &mbhc_cb, &intr_ids,
wcd_mbhc_registers, WCD938X_ZDET_SUPPORTED);
if (ret) {