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

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

Merge "ARM: dts: msm: Enable DRD mode for 2nd USB controller on MSM8996 Auto"

parents 37bca2d3 bcf8bc83

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -1238,9 +1238,6 @@ 


&usb2s {

	status = "ok";

	dwc3@7600000 {

		dr_mode = "host";

	};

};



&usb3 {

drivers/usb/dwc3/dwc3-msm.c

+9 −4
Original line number Diff line number Diff line
@@ -2671,12 +2671,16 @@ static int dwc3_msm_extcon_register(struct dwc3_msm *mdwc) 
{

	struct device_node *node = mdwc->dev->of_node;

	struct extcon_dev *edev;

	struct dwc3 *dwc;

	int ret = 0;



	dwc = platform_get_drvdata(mdwc->dwc3);

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

		if (usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST)

		dev_dbg(mdwc->dev, "extcon property doesn't exist\n");

		if (usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST

							|| dwc->is_drd)

			return 0;

		dev_err(mdwc->dev, "extcon property doesn't exist\n");

		dev_err(mdwc->dev, "Neither host nor DRD, fail probe\n");

		return -EINVAL;

	}
@@ -3137,8 +3141,9 @@ static int dwc3_msm_probe(struct platform_device *pdev) 
	device_create_file(&pdev->dev, &dev_attr_speed);



	host_mode = usb_get_dr_mode(&mdwc->dwc3->dev) == USB_DR_MODE_HOST;

	if (!dwc->is_drd && host_mode) {

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

	if (host_mode ||

		(dwc->is_drd && !of_property_read_bool(node, "extcon"))) {

		dev_dbg(&pdev->dev, "DWC3 in default host mode\n");

		mdwc->id_state = DWC3_ID_GROUND;

		dwc3_ext_event_notify(mdwc);

	}