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

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

Merge "ASoC: wcd9xxx: Change PA on and VDDIO switch sequence"

parents 2d117e27 7eed4ec0

sound/soc/codecs/wcd9xxx-mbhc.c

+10 −8
Original line number Diff line number Diff line
@@ -959,6 +959,16 @@ static void wcd9xxx_report_plug(struct wcd9xxx_mbhc *mbhc, int insertion, 
			 jack_type, mbhc->hph_status);

		wcd9xxx_jack_report(mbhc, &mbhc->headset_jack,

				    mbhc->hph_status, WCD9XXX_JACK_MASK);

		/*

		 * if PA is already on, switch micbias

		 * source to VDDIO

		 */

		if (((mbhc->current_plug == PLUG_TYPE_HEADSET) ||

		     (mbhc->current_plug == PLUG_TYPE_ANC_HEADPHONE)) &&

		    ((mbhc->event_state & (1 << MBHC_EVENT_PA_HPHL |

			1 << MBHC_EVENT_PA_HPHR))))

			__wcd9xxx_switch_micbias(mbhc, 1, false,

						 false);

		wcd9xxx_clr_and_turnon_hph_padac(mbhc);

	}

	/* Setup insert detect */
@@ -2363,14 +2373,6 @@ static void wcd9xxx_find_plug_and_report(struct wcd9xxx_mbhc *mbhc, 
		 */

		msleep(100);



		/*

		 * if PA is already on, switch micbias

		 * source to VDDIO

		 */

		if (mbhc->event_state &

		(1 << MBHC_EVENT_PA_HPHL | 1 << MBHC_EVENT_PA_HPHR))

			__wcd9xxx_switch_micbias(mbhc, 1, false,

						 false);

		wcd9xxx_start_hs_polling(mbhc);

	} else if (plug_type == PLUG_TYPE_HIGH_HPH) {

		if (mbhc->mbhc_cfg->detect_extn_cable) {