ASoC: msm8226: Disable headset detection
Disable headset detection by default since Multi Button Headset
Control (MBHC) feature is not yet available
Change-Id: Iac19243d33cd5eaed899f243aa0a08251c19ebed
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
diff --git a/sound/soc/codecs/wcd9306.c b/sound/soc/codecs/wcd9306.c
index 6aa0ad0..634493b 100644
--- a/sound/soc/codecs/wcd9306.c
+++ b/sound/soc/codecs/wcd9306.c
@@ -4226,12 +4226,7 @@
return ret;
}
- /* init and start mbhc */
- ret = wcd9xxx_mbhc_init(&tapan->mbhc, &tapan->resmgr, codec);
- if (ret) {
- pr_err("%s: mbhc init failed %d\n", __func__, ret);
- return ret;
- }
+ /* TODO: wcd9xxx_mbhc_init to enable mbhc */
tapan->codec = codec;
for (i = 0; i < COMPANDER_MAX; i++) {
diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c
index 328c380..e13443a 100644
--- a/sound/soc/msm/msm8226.c
+++ b/sound/soc/msm/msm8226.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -378,8 +378,11 @@
/* start mbhc */
mbhc_cfg.calibration = def_tapan_mbhc_cal();
- if (mbhc_cfg.calibration)
- err = tapan_hs_detect(codec, &mbhc_cfg);
+ if (mbhc_cfg.calibration) {
+ pr_info("%s: WCD9306: Headset detection disabled\n",
+ __func__);
+ }
+
else
err = -ENOMEM;