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

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

Merge "ARM: dts: msm: Enable secondary USB controller on SA6155"

parents 0374aa5d 2a9723cf

Documentation/devicetree/bindings/usb/msm-ssusb.txt

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ Optional properties : 
- qcom,host-poweroff-in-pm-suspend: If present, allow PM suspend to happen

	irrespective of runtimePM state of host and power collapse the core.

	This also leads to reset-resume of connected devices on PM resume.

- qcom,default-mode-host: If present, start host mode on probe for an OTG

	capable DWC3 which does not have extcon handle.



Sub nodes:

- Sub node for "DWC3- USB3 controller".

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -97,10 +97,9 @@ 
	status = "ok";

};



&usb0 {

	dwc3@a600000 {

		dr_mode = "peripheral";

	};

&usb1 {

	status = "ok";

	qcom,default-mode-host;

};



&qupv3_se0_2uart {

drivers/usb/dwc3/dwc3-msm.c

+7 −5
Original line number Diff line number Diff line
@@ -3675,13 +3675,15 @@ static int dwc3_msm_probe(struct platform_device *pdev) 
		if (ret)

			goto put_dwc3;

	} else {

		if (dwc->dr_mode == USB_DR_MODE_OTG ||

		if ((dwc->dr_mode == USB_DR_MODE_OTG &&

		     !of_property_read_bool(node, "qcom,default-mode-host")) ||

		     dwc->dr_mode == USB_DR_MODE_PERIPHERAL) {

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

			dev_dbg(mdwc->dev, "%s: no extcon, start peripheral mode\n",

								__func__);

			mdwc->vbus_active = true;

		} else if (dwc->dr_mode == USB_DR_MODE_HOST) {

			dev_dbg(mdwc->dev, "DWC3 in host only mode\n");

		} else {

			dev_dbg(mdwc->dev, "%s: no extcon, start host mode\n",

								__func__);

			mdwc->id_state = DWC3_ID_GROUND;

		}