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

Commit 0a5e0f5a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3-msm: Remove the read of qcom,vbus-present property"

parents a2a026ed 901c828c

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

+0 −3
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ Optional properties : 
- qcom,usb-dbm : phandle for the DBM device

- qcom,lpm-to-suspend-delay-ms: Indicates timeout (in milliseconds) to release wakeup source

  after USB is kept into LPM.

- qcom,vbus-present: Indicates that there is no VBUS indication from PMIC. Assume VBUS is

  present if this property is defined.

- qcom,ext-hub-reset-gpio: This corresponds to gpio which is used for HUB reset.

- qcom,disable-dev-mode-pm: If present, it disables PM runtime functionality for device mode.

- qcom,disable-host-mode-pm: If present, it disables XHCI PM runtime functionality when USB
@@ -66,7 +64,6 @@ Example MSM USB3.0 controller device node : 
		qcom,dwc-usb3-msm-tx-fifo-size = <29696>;

		qcom,usb-dbm = <&dbm_1p4>;

		qcom,lpm-to-suspend-delay-ms = <2>;

		qcom,vbus-present;



		qcom,msm_bus,name = "usb3";

		qcom,msm_bus,num_cases = <2>;

drivers/usb/dwc3/dwc3-msm.c

+0 −1
Original line number Diff line number Diff line
@@ -2930,7 +2930,6 @@ static int dwc3_msm_probe(struct platform_device *pdev) 
		goto put_dwc3;

	}



	dwc->vbus_active = of_property_read_bool(node, "qcom,vbus-present");

	mdwc->irq_to_affin = platform_get_irq(mdwc->dwc3, 0);

	mdwc->dwc3_cpu_notifier.notifier_call = dwc3_cpu_notifier_cb;