Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 290fb09f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd: enable mbhc interrupts after SSR"

parents babf53b8 671f9a01
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -4929,6 +4929,7 @@ static int msm8x16_wcd_device_up(struct snd_soc_codec *codec)
		snd_soc_codec_get_drvdata(codec);
	const struct snd_soc_codec_driver *codec_drv = codec->driver;
	u32 reg;
	int ret = 0;

	dev_dbg(codec->dev, "%s: device up!\n", __func__);

@@ -4976,6 +4977,13 @@ static int msm8x16_wcd_device_up(struct snd_soc_codec *codec)

	msm8x16_wcd_configure_cap(codec, false, false);
	wcd_mbhc_stop(&msm8x16_wcd_priv->mbhc);
	wcd_mbhc_deinit(&msm8x16_wcd_priv->mbhc);
	ret = wcd_mbhc_init(&msm8x16_wcd_priv->mbhc, codec, &mbhc_cb, &intr_ids,
			wcd_mbhc_registers, true);
	if (ret)
		dev_err(codec->dev, "%s: mbhc initialization failed\n",
			__func__);
	else
		wcd_mbhc_start(&msm8x16_wcd_priv->mbhc,
			msm8x16_wcd_priv->mbhc.mbhc_cfg);