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

Commit ed4f8fa4 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: mbhc: Report SW_JACK_PHYSICAL_INSERT"

parents c2435f05 75c26871

sound/soc/codecs/wcd9xxx-mbhc.c

+4 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 


#define WCD9XXX_JACK_MASK (SND_JACK_HEADSET | SND_JACK_OC_HPHL | \

			   SND_JACK_OC_HPHR | SND_JACK_LINEOUT | \

			   SND_JACK_UNSUPPORTED | SND_JACK_MICROPHONE2)

			   SND_JACK_UNSUPPORTED | SND_JACK_MICROPHONE2 | \

			   SND_JACK_MECHANICAL)

#define WCD9XXX_JACK_BUTTON_MASK (SND_JACK_BTN_0 | SND_JACK_BTN_1 | \

				  SND_JACK_BTN_2 | SND_JACK_BTN_3 | \

				  SND_JACK_BTN_4 | SND_JACK_BTN_5 | \
@@ -977,7 +978,8 @@ static void wcd9xxx_report_plug(struct wcd9xxx_mbhc *mbhc, int insertion, 
		pr_debug("%s: Reporting insertion %d(%x)\n", __func__,

			 jack_type, mbhc->hph_status);

		wcd9xxx_jack_report(mbhc, &mbhc->headset_jack,

				    mbhc->hph_status, WCD9XXX_JACK_MASK);

				    (mbhc->hph_status | SND_JACK_MECHANICAL),

				    WCD9XXX_JACK_MASK);

		/*

		 * if PA is already on, switch micbias

		 * source to VDDIO