diff options
| -rw-r--r-- | sound/soc/codecs/wcd9xxx-mbhc.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wcd9xxx-mbhc.h | 1 | ||||
| -rw-r--r-- | sound/soc/msm/msm8226.c | 1 | ||||
| -rw-r--r-- | sound/soc/msm/msm8974.c | 1 | ||||
| -rw-r--r-- | sound/soc/msm/msm8x10.c | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c index 5441ec300e5d..07e9d2b0c896 100644 --- a/sound/soc/codecs/wcd9xxx-mbhc.c +++ b/sound/soc/codecs/wcd9xxx-mbhc.c @@ -128,7 +128,7 @@ module_param(impedance_detect_en, int, S_IRUGO | S_IWUSR | S_IWGRP); MODULE_PARM_DESC(impedance_detect_en, "enable/disable impedance detect"); -static bool detect_use_vddio_switch = true; +static bool detect_use_vddio_switch; struct wcd9xxx_mbhc_detect { u16 dce; @@ -1767,6 +1767,7 @@ wcd9xxx_codec_get_plug_type(struct wcd9xxx_mbhc *mbhc, bool highhph) /* GND and MIC swap detection requires at least 2 rounds of DCE */ BUG_ON(NUM_DCE_PLUG_INS_DETECT < 2); + detect_use_vddio_switch = mbhc->mbhc_cfg->use_vddio_meas; /* * There are chances vddio switch is on and cfilt voltage is adjusted diff --git a/sound/soc/codecs/wcd9xxx-mbhc.h b/sound/soc/codecs/wcd9xxx-mbhc.h index a82da3c56167..29dd84a4e018 100644 --- a/sound/soc/codecs/wcd9xxx-mbhc.h +++ b/sound/soc/codecs/wcd9xxx-mbhc.h @@ -229,6 +229,7 @@ struct wcd9xxx_mbhc_config { unsigned long cs_enable_flags; bool use_int_rbias; bool do_recalibration; + bool use_vddio_meas; }; struct wcd9xxx_cfilt_mode { diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c index 263c043c87ec..5ecb2bb361d7 100644 --- a/sound/soc/msm/msm8226.c +++ b/sound/soc/msm/msm8226.c @@ -94,6 +94,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 1 << MBHC_CS_ENABLE_INSERTION | 1 << MBHC_CS_ENABLE_REMOVAL), .do_recalibration = true, + .use_vddio_meas = true, }; struct msm_auxpcm_gpio { diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c index 4240f8f61435..667ee807f862 100644 --- a/sound/soc/msm/msm8974.c +++ b/sound/soc/msm/msm8974.c @@ -129,6 +129,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 1 << MBHC_CS_ENABLE_INSERTION | 1 << MBHC_CS_ENABLE_REMOVAL), .do_recalibration = true, + .use_vddio_meas = true, }; struct msm_auxpcm_gpio { diff --git a/sound/soc/msm/msm8x10.c b/sound/soc/msm/msm8x10.c index cfe4af7d074f..0d99f1a930eb 100644 --- a/sound/soc/msm/msm8x10.c +++ b/sound/soc/msm/msm8x10.c @@ -77,6 +77,7 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 1 << MBHC_CS_ENABLE_INSERTION | 1 << MBHC_CS_ENABLE_REMOVAL), .do_recalibration = false, + .use_vddio_meas = false, }; /* |