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

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

Merge "ARM: dts: msm: Correct secondary USB controller core-id"

parents c3f96f04 02680478

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

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ 
			snps,hird-threshold = /bits/ 8 <0x10>;

			snps,usb3_lpm_capable;

			snps,bus-suspend-enable;

			usb-core-id = <0>;

			usb-core-id = <1>;

			maximum-speed = "super-speed";

			dr_mode = "otg";

		};

drivers/usb/dwc3/dwc3-msm.c

+3 −16
Original line number Diff line number Diff line
@@ -1342,13 +1342,9 @@ static void gsi_set_clear_dbell(struct usb_ep *ep, 
 *

 * @usb_ep - pointer to usb_ep instance to access DWC3 regs

 */

static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend)

static bool gsi_check_ready_to_suspend(struct dwc3_msm *mdwc)

{

	u32	timeout = 1500;

	u32	reg = 0;

	struct dwc3_ep *dep = to_dwc3_ep(ep);

	struct dwc3 *dwc = dep->dwc;

	struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);



	while (dwc3_msm_read_reg_field(mdwc->base,

		GSI_IF_STS(mdwc->gsi_reg[IF_STS]), GSI_WR_CTRL_STATE_MASK)) {
@@ -1358,14 +1354,6 @@ static bool gsi_check_ready_to_suspend(struct usb_ep *ep, bool f_suspend) 
			return false;

		}

	}

	/* Check for U3 only if we are not handling Function Suspend */

	if (!f_suspend) {

		reg = dwc3_readl(dwc->regs, DWC3_DSTS);

		if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U3) {

			dev_err(mdwc->dev, "Unable to suspend GSI ch\n");

			return false;

		}

	}



	return true;

}
@@ -1397,7 +1385,7 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 
	struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);

	struct usb_gsi_request *request;

	struct gsi_channel_info *ch_info;

	bool block_db, f_suspend;

	bool block_db;

	unsigned long flags;



	dbg_log_string("%s(%d):%s", ep->name, ep->ep_num, gsi_op_to_string(op));
@@ -1457,8 +1445,7 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 
		gsi_set_clear_dbell(ep, block_db);

		break;

	case GSI_EP_OP_CHECK_FOR_SUSPEND:

		f_suspend = *((bool *)op_data);

		ret = gsi_check_ready_to_suspend(ep, f_suspend);

		ret = gsi_check_ready_to_suspend(mdwc);

		break;

	case GSI_EP_OP_DISABLE:

		ret = ep->ops->disable(ep);