Merge "ASoC: wcd: correct handling of MICBIAS regulator" (a4fe46ef) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8x16-wcd.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -1844,15 +1844,26 @@ static int msm8x16_wcd_enable_ext_mb_source(struct snd_soc_codec *codec,
		bool turn_on)
		{
		int ret = 0;
		static int count;

		if (turn_on)
		dev_dbg(codec->dev, "%s turn_on: %d count: %d\n", __func__, turn_on,
		count);
		if (turn_on) {
		if (!count) {
		ret = snd_soc_dapm_force_enable_pin(&codec->dapm,
		"MICBIAS_REGULATOR");
		else
		snd_soc_dapm_sync(&codec->dapm);
		}
		count++;
		} else {
		if (count > 0)
		count--;
		if (!count) {
		ret = snd_soc_dapm_disable_pin(&codec->dapm,
		"MICBIAS_REGULATOR");

		snd_soc_dapm_sync(&codec->dapm);
		}
		}

		if (ret)
		dev_err(codec->dev, "%s: Failed to %s external micbias source\n",

sound/soc/codecs/wcd-mbhc-v2.c

+12 −16

Original line number	Diff line number	Diff line
		@@ -820,10 +820,6 @@ static void wcd_correct_swch_plug(struct work_struct *work)
		mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch);
		codec = mbhc->codec;

		/* Enable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, true);

		/* Enable micbias for detection in correct work*/
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_MICB_2_EN,
		@@ -956,9 +952,6 @@ report:
		wcd_mbhc_find_plug_and_report(mbhc, plug_type);
		WCD_MBHC_RSC_UNLOCK(mbhc);
		exit:
		/* Disable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, false);
		wcd9xxx_spmi_unlock_sleep();
		pr_debug("%s: leave\n", __func__);
		}
		@@ -977,10 +970,6 @@ static void wcd_mbhc_detect_plug_type(struct wcd_mbhc *mbhc)
		pr_debug("%s: enter\n", __func__);
		WCD_MBHC_RSC_ASSERT_LOCKED(mbhc);

		/* Enable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, true);

		/* Enable micbias */
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_MICB_2_EN,
		@@ -1054,10 +1043,6 @@ static void wcd_mbhc_detect_plug_type(struct wcd_mbhc *mbhc)
		}
		}
		exit:
		/* Disable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, false);

		pr_debug("%s: Valid plug found, plug type is %d\n",
		__func__, plug_type);
		if (plug_type != MBHC_PLUG_TYPE_HIGH_HPH &&
		@@ -1098,6 +1083,9 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
		/* Set the detection type appropriately */
		snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_MBHC_DET_CTL_1,
		0x20, (!detection_type << 5));

		pr_debug("%s: mbhc->current_plug: %d detection_type: %d\n", __func__,
		mbhc->current_plug, detection_type);
		wcd_cancel_hs_detect_plug(mbhc, &mbhc->correct_plug_swch);

		if ((mbhc->current_plug == MBHC_PLUG_TYPE_NONE) &&
		@@ -1126,9 +1114,15 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
		/* Apply trim if needed on the device */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->trim_btn_reg)
		mbhc->mbhc_cb->trim_btn_reg(codec);
		/* Enable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, true);
		wcd_mbhc_detect_plug_type(mbhc);
		} else if ((mbhc->current_plug != MBHC_PLUG_TYPE_NONE)
		&& !detection_type) {
		/* Disable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, false);
		/* Disable HW FSM */
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,
		@@ -1170,9 +1164,11 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
		MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,
		0x30, 0x30);
		wcd_mbhc_report_plug(mbhc, 0, SND_JACK_LINEOUT);

		}
		} else if (!detection_type) {
		/* Disable external voltage source to micbias if present */
		if (mbhc->mbhc_cb && mbhc->mbhc_cb->enable_mb_source)
		mbhc->mbhc_cb->enable_mb_source(codec, false);
		/* Disable HW FSM */
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL,