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

Commit e1f6dfc5 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: Disable RxTerm Detection by Core in U3 state"

parents fa8ca392 a8989a60

drivers/usb/dwc3/core.h

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ 
#define DWC3_GUSB3PIPECTL_DISRXDETINP3	(1 << 28)

#define DWC3_GUSB3PIPECTL_UX_EXIT_PX	(1 << 27)

#define DWC3_GUSB3PIPECTL_REQP1P2P3	(1 << 24)

#define DWC3_GUSB3PIPECTL_DISRXDETU3	(1 << 22)

#define DWC3_GUSB3PIPECTL_DEP1P2P3(n)	((n) << 19)

#define DWC3_GUSB3PIPECTL_DEP1P2P3_MASK	DWC3_GUSB3PIPECTL_DEP1P2P3(7)

#define DWC3_GUSB3PIPECTL_DEP1P2P3_EN	DWC3_GUSB3PIPECTL_DEP1P2P3(1)

drivers/usb/dwc3/dwc3-msm.c

+13 −0
Original line number Diff line number Diff line
@@ -2347,6 +2347,12 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool hibernation) 


	/* Suspend SS PHY */

	if (dwc->maximum_speed == USB_SPEED_SUPER) {

		if (mdwc->in_host_mode) {

			u32 reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));



			reg |= DWC3_GUSB3PIPECTL_DISRXDETU3;

			dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);

		}

		/* indicate phy about SS mode */

		if (dwc3_msm_is_superspeed(mdwc))

			mdwc->ss_phy->flags |= DEVICE_IN_SS_MODE;
@@ -2531,6 +2537,13 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc) 
		usb_phy_set_suspend(mdwc->ss_phy, 0);

		mdwc->ss_phy->flags &= ~DEVICE_IN_SS_MODE;

		mdwc->lpm_flags &= ~MDWC3_SS_PHY_SUSPEND;



		if (mdwc->in_host_mode) {

			u32 reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));



			reg &= ~DWC3_GUSB3PIPECTL_DISRXDETU3;

			dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);

		}

	}



	mdwc->hs_phy->flags &= ~(PHY_HSFS_MODE | PHY_LS_MODE);