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

Merge "ASoC: wcd-mbhc: Disable moisture_en when duty cycle is enabled"

Browse Source
This commit is contained in:
Linux Build Service Account
2019-02-27 01:15:28 -08:00
committed by Gerrit - the friendly Code Review server
parent 87219bb7e3 e1728c5c3c
commit 4b44ce5637
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asoc/codecs/wcd-mbhc-v2.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. /* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@@ -850,7 +850,7 @@ static bool wcd_mbhc_moisture_detect(struct wcd_mbhc *mbhc, bool detection_type)
{ {
bool ret = false; bool ret = false;
if (!mbhc->mbhc_cfg->moisture_en || if (!mbhc->mbhc_cfg->moisture_en &&
!mbhc->mbhc_cfg->moisture_duty_cycle_en) !mbhc->mbhc_cfg->moisture_duty_cycle_en)
return ret; return ret;
@@ -1342,9 +1342,15 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)
else else
WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HS_L_DET_PULL_UP_CTRL, 3); WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_HS_L_DET_PULL_UP_CTRL, 3);
/* Configure for moisture detection when duty cycle is not enabled.
* Otherwise disable moisture detection.
*/
if (mbhc->mbhc_cfg->moisture_en && mbhc->mbhc_cb->mbhc_moisture_config if (mbhc->mbhc_cfg->moisture_en && mbhc->mbhc_cb->mbhc_moisture_config
&& !mbhc->mbhc_cfg->moisture_duty_cycle_en) && !mbhc->mbhc_cfg->moisture_duty_cycle_en)
mbhc->mbhc_cb->mbhc_moisture_config(mbhc); mbhc->mbhc_cb->mbhc_moisture_config(mbhc);
else if (mbhc->mbhc_cfg->moisture_duty_cycle_en &&
mbhc->mbhc_cb->mbhc_moisture_detect_en)
mbhc->mbhc_cb->mbhc_moisture_detect_en(mbhc, false);
/* /*
* For USB analog we need to override the switch configuration. * For USB analog we need to override the switch configuration.