sound/soc/codecs/wcd-mbhc-v2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
From: David Heidelberg <david@ixit.cz>
Improves debugging experience.
Fixes: 0e5c9e7ff899 ("ASoC: codecs: wcd: add multi button Headset detection support")
Signed-off-by: David Heidelberg <david@ixit.cz>
---
sound/soc/codecs/wcd-mbhc-v2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index bb0c8478a8eb5..850be84d65ceb 100644
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -859,17 +859,17 @@ static int wcd_get_voltage_from_adc(u8 val, int micbias)
static int wcd_measure_adc_continuous(struct wcd_mbhc *mbhc)
{
u8 adc_result;
int output_mv;
int retry = 3;
u8 adc_en;
/* Pre-requisites for ADC continuous measurement */
- /* Read legacy electircal detection and disable */
+ /* Read legacy electrical detection and disable */
wcd_mbhc_write_field(mbhc, WCD_MBHC_ELECT_SCHMT_ISRC, 0x00);
/* Set ADC to continuous measurement */
wcd_mbhc_write_field(mbhc, WCD_MBHC_ADC_MODE, 1);
/* Read ADC Enable bit to restore after adc measurement */
adc_en = wcd_mbhc_read_field(mbhc, WCD_MBHC_ADC_EN);
/* Disable ADC_ENABLE bit */
wcd_mbhc_write_field(mbhc, WCD_MBHC_ADC_EN, 0);
/* Disable MBHC FSM */
@@ -960,17 +960,17 @@ static int wcd_check_cross_conn(struct wcd_mbhc *mbhc)
u8 adc_mode, elect_ctl, adc_en, fsm_en;
int hphl_adc_res, hphr_adc_res;
bool is_cross_conn = false;
/* If PA is enabled, dont check for cross-connection */
if (wcd_mbhc_read_field(mbhc, WCD_MBHC_HPH_PA_EN))
return -EINVAL;
- /* Read legacy electircal detection and disable */
+ /* Read legacy electrical detection and disable */
elect_ctl = wcd_mbhc_read_field(mbhc, WCD_MBHC_ELECT_SCHMT_ISRC);
wcd_mbhc_write_field(mbhc, WCD_MBHC_ELECT_SCHMT_ISRC, 0);
/* Read and set ADC to single measurement */
adc_mode = wcd_mbhc_read_field(mbhc, WCD_MBHC_ADC_MODE);
/* Read ADC Enable bit to restore after adc measurement */
adc_en = wcd_mbhc_read_field(mbhc, WCD_MBHC_ADC_EN);
/* Read FSM status */
@@ -1465,24 +1465,24 @@ int wcd_dt_parse_mbhc_data(struct device *dev, struct wcd_mbhc_config *cfg)
if (of_property_read_bool(np, "qcom,ground-jack-type-normally-closed"))
cfg->gnd_swh = false;
else
cfg->gnd_swh = true;
ret = of_property_read_u32(np, "qcom,mbhc-headset-vthreshold-microvolt",
µvolt);
if (ret)
- dev_dbg(dev, "missing qcom,mbhc-hs-mic-max-vthreshold--microvolt in dt node\n");
+ dev_dbg(dev, "missing qcom,mbhc-headset-vthreshold-microvolt in dt node\n");
else
cfg->hs_thr = microvolt/1000;
ret = of_property_read_u32(np, "qcom,mbhc-headphone-vthreshold-microvolt",
µvolt);
if (ret)
- dev_dbg(dev, "missing qcom,mbhc-hs-mic-min-vthreshold-microvolt entry\n");
+ dev_dbg(dev, "missing qcom,mbhc-headphone-vthreshold-microvolt entry\n");
else
cfg->hph_thr = microvolt/1000;
ret = of_property_read_u32_array(np,
"qcom,mbhc-buttons-vthreshold-microvolt",
&cfg->btn_high[0],
WCD_MBHC_DEF_BUTTONS);
if (ret)
---
base-commit: 7079a12d7506b07fb53b54a664bfad5fa9b16d70
change-id: 20260823-wcd-dt-typo-fix-9812d3c97fe5
Best regards,
--
David Heidelberg <david@ixit.cz>
On Sun, 23 Aug 2026 11:09:55 +0200, David Heidelberg wrote:
> ASoC: wcd-mbhc-v2: Fix incorrect properties names and typos
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.4
Thanks!
[1/1] ASoC: wcd-mbhc-v2: Fix incorrect properties names and typos
https://git.kernel.org/broonie/sound/c/17bca5d55446
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
On 8/23/2026 2:39 PM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
>
> Improves debugging experience.
>
> Fixes: 0e5c9e7ff899 ("ASoC: codecs: wcd: add multi button Headset detection support")
> Signed-off-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Prasad Kumpatla <prasad.kumpatla@oss.qualcomm.com>
Thanks,
Prasad
© 2016 - 2026 Red Hat, Inc.