Merge "ASOC: Remove support for ANC headphones"

asoc/codecs/wcd-mbhc-v2.c

@@ -662,7 +662,6 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
 #if IS_ENABLED(CONFIG_AUDIO_QGKI)
 			mbhc->hph_status &= ~(SND_JACK_HEADSET |
 						SND_JACK_LINEOUT |
-						SND_JACK_ANC_HEADPHONE |
 						SND_JACK_UNSUPPORTED);
 #else
 			mbhc->hph_status &= ~(SND_JACK_HEADSET |
@@ -686,10 +685,9 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
 			mbhc->jiffies_atreport = jiffies;
 		} else if (jack_type == SND_JACK_LINEOUT)
 			mbhc->current_plug = MBHC_PLUG_TYPE_HIGH_HPH;
-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
-		else if (jack_type == SND_JACK_ANC_HEADPHONE)
-			mbhc->current_plug = MBHC_PLUG_TYPE_ANC_HEADPHONE;
-#endif /* CONFIG_AUDIO_QGKI */
+		else {
+			pr_debug("%s: invalid Jack type %d\n",__func__, jack_type);
+		}
 
 		if (mbhc->mbhc_cb->hph_pa_on_status)
 			is_pa_on = mbhc->mbhc_cb->hph_pa_on_status(component);
@@ -854,10 +852,6 @@ void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc,
 			anc_mic_found =
 			mbhc->mbhc_fn->wcd_mbhc_detect_anc_plug_type(mbhc);
 		jack_type = SND_JACK_HEADSET;
-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
-		if (anc_mic_found)
-			jack_type = SND_JACK_ANC_HEADPHONE;
-#endif /* CONFIG_AUDIO_QGKI */
 
 		/*
 		 * If Headphone was reported previously, this will
@@ -1042,11 +1036,6 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc)
 			mbhc->is_extn_cable = false;
 			jack_type = SND_JACK_LINEOUT;
 			break;
-#if IS_ENABLED(CONFIG_AUDIO_QGKI)
-		case MBHC_PLUG_TYPE_ANC_HEADPHONE:
-			jack_type = SND_JACK_ANC_HEADPHONE;
-			break;
-#endif /* CONFIG_AUDIO_QGKI */
 		default:
 			pr_info("%s: Invalid current plug: %d\n",
 				__func__, mbhc->current_plug);

include/asoc/wcd-mbhc-v2.h

@@ -124,7 +124,7 @@ do {                                                    \
 #if IS_ENABLED(CONFIG_AUDIO_QGKI)
 #define WCD_MBHC_JACK_MASK (SND_JACK_HEADSET | SND_JACK_OC_HPHL | \
 			   SND_JACK_OC_HPHR | SND_JACK_LINEOUT | \
-			   SND_JACK_MECHANICAL | SND_JACK_MICROPHONE2 | \
+			   SND_JACK_MECHANICAL | \
 			   SND_JACK_UNSUPPORTED)
 #else
 #define WCD_MBHC_JACK_MASK (SND_JACK_HEADSET | SND_JACK_LINEOUT | \