Merge "ASoC: wcd-mbhc: Remove hardcoding of hphl and gnd swh to NC for analog USBC" into audio-drivers.lnx.4.0

asoc/codecs/wcd-mbhc-v2.c

@@ -1358,9 +1358,6 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc)
 	 * by an external source
 	 */
 	if (mbhc->mbhc_cfg->enable_usbc_analog) {
-		mbhc->hphl_swh = 0;
-		mbhc->gnd_swh = 0;
-
 		if (mbhc->mbhc_cb->hph_pull_up_control_v2)
 			mbhc->mbhc_cb->hph_pull_up_control_v2(component,
 							      HS_PULLUP_I_OFF);