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

Commit 9f4e65ad authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove extcon for USB2.0 on QCS405"

parents 192b5f39 98159c5d

arch/arm64/boot/dts/qcom/qcs405.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -1043,7 +1043,3 @@ 
			     &usb3_vbus_boost_default>;

	};

};
 


&usb2s {

	extcon = <&smb1351_otg_supply>;

};

drivers/usb/dwc3/dwc3-msm.c

+9 −1
Original line number Diff line number Diff line
@@ -2907,9 +2907,17 @@ static int dwc3_msm_extcon_register(struct dwc3_msm *mdwc) 
	struct extcon_dev *edev;

	int idx, extcon_cnt, ret = 0;

	bool check_vbus_state, check_id_state, phandle_found = false;

	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);



	if (!of_property_read_bool(node, "extcon"))

	if (!of_property_read_bool(node, "extcon") &&

				(dwc->dr_mode == USB_DR_MODE_OTG)) {

		dev_dbg(mdwc->dev, "%s: no extcon, simulate vbus connect\n",

								__func__);

		mdwc->vbus_active = true;

		dwc->vbus_active = true;

		queue_work(mdwc->dwc3_wq, &mdwc->resume_work);

		return 0;

	}



	extcon_cnt = of_count_phandle_with_args(node, "extcon", NULL);

	if (extcon_cnt < 0) {