Merge "usb: dwc: use bit definition macros" (34e35e7c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -194,6 +194,7 @@

		/* Global USB2 PHY Configuration Register */
		#define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31)
		#define DWC3_GUSB2PHYCFG_ENBLSLPM (1 << 8)
		#define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6)

		/* Global USB3 PIPE Control Register */

+4 −4

Original line number	Diff line number	Diff line
		@@ -893,7 +893,6 @@ bool msm_dwc3_reset_ep_after_lpm(struct usb_gadget *gadget)
		}
		EXPORT_SYMBOL(msm_dwc3_reset_ep_after_lpm);


		/*
		* Config Global Distributed Switch Controller (GDSC)
		* to support controller power collapse
		@@ -1473,7 +1472,8 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		if (host_bus_suspend) {
		dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0),
		dwc3_msm_read_reg(mdwc->base, DWC3_GUSB2PHYCFG(0)) \|
		0x00000140);
		DWC3_GUSB2PHYCFG_ENBLSLPM \|
		DWC3_GUSB2PHYCFG_SUSPHY);
		}

		usb_phy_set_suspend(mdwc->hs_phy, 1);
		@@ -1585,12 +1585,12 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)
		/* Reset UTMI HSPHY interface */
		dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0),
		dwc3_msm_read_reg(mdwc->base, DWC3_GUSB2PHYCFG(0)) \|
		0x80000000);
		DWC3_GUSB2PHYCFG_PHYSOFTRST);
		/* 10usec delay required before de-asserting PHY RESET */
		udelay(10);
		dwc3_msm_write_reg(mdwc->base, DWC3_GUSB2PHYCFG(0),
		dwc3_msm_read_reg(mdwc->base, DWC3_GUSB2PHYCFG(0)) &
		0x7FFFFFFF);
		~DWC3_GUSB2PHYCFG_PHYSOFTRST);
		/* Reset HSPHY */
		if (mdwc->reset_hsphy_sleep_clk) {
		ret = dwc3_hsphy_reset(mdwc);