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

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

Merge "usb: dwc3: Fix probe failure in host only mode"

parents 36bb13c4 bcdb609d

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
		#size-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges;





		interrupts = <0 25 0>, <0 24 0>;

		interrupts = <0 25 0>, <0 319 0>;

		interrupt-names = "pwr_event_irq", "hs_phy_irq";

		interrupt-names = "pwr_event_irq", "hs_phy_irq";





		clocks = <&clock_gcc GCC_USB30_MASTER_CLK>,

		clocks = <&clock_gcc GCC_USB30_MASTER_CLK>,
@@ -132,7 +132,7 @@ 
		#size-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges;





		interrupts = <0 32 0>, <0 31 0>;

		interrupts = <0 32 0>, <0 318 0>;

		interrupt-names = "pwr_event_irq", "hs_phy_irq";

		interrupt-names = "pwr_event_irq", "hs_phy_irq";





		clocks = <&clock_gcc GCC_USB_HS_SYSTEM_CLK>,

		clocks = <&clock_gcc GCC_USB_HS_SYSTEM_CLK>,

drivers/usb/dwc3/dwc3-msm.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -2909,13 +2909,13 @@ static int dwc3_msm_extcon_register(struct dwc3_msm *mdwc) 
	bool check_vbus_state, check_id_state, phandle_found = false;

	bool check_vbus_state, check_id_state, phandle_found = false;

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

	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)) {

		if (dwc->dr_mode == USB_DR_MODE_OTG) {

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

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

								__func__);

								__func__);

			mdwc->vbus_active = true;

			mdwc->vbus_active = true;

		dwc->vbus_active = true;

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

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

		}

		return 0;

		return 0;

	}

	}