Prechádzať zdrojové kódy

Merge "asoc: codec: Add call to wcd_usbss_switch_update in the pineapple machine driver" into audio-kernel.lnx.6.0

Linux Build Service Account 2 rokov pred
rodič
commit
c2adcdf8a0
1 zmenil súbory, kde vykonal 6 pridanie a 0 odobranie
  1. 6 0
      asoc/pineapple.c

+ 6 - 0
asoc/pineapple.c

@@ -1357,6 +1357,12 @@ static int msm_snd_card_late_probe(struct snd_soc_card *card)
 	if (!mbhc_calibration)
 		return -ENOMEM;
 	wcd_mbhc_cfg.calibration = mbhc_calibration;
+
+#if IS_ENABLED(CONFIG_QCOM_WCD_USBSS_I2C)
+	if (of_find_property(card->dev->of_node, "qcom,usbss-hsj-connect-enabled", NULL))
+		wcd_usbss_switch_update(WCD_USBSS_HSJ_CONNECT, WCD_USBSS_CABLE_CONNECT);
+#endif
+
 	ret = wcd939x_mbhc_hs_detect(component, &wcd_mbhc_cfg);
 	if (ret) {
 		dev_err(component->dev, "%s: mbhc hs detect failed, err:%d\n",