Merge "usb: phy: snps: Enable auto-resume during host mode bus suspend" (581a648d) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/phy/phy-msm-snps-hs.c

+17 −9

Original line number	Diff line number	Diff line
		@@ -487,7 +487,15 @@ static int msm_hsphy_set_suspend(struct usb_phy *uphy, int suspend)
		if (suspend) { /* Bus suspend */
		if (phy->cable_connected \|\|
		(phy->phy.flags & PHY_HOST_MODE)) {
		/* Enable auto-resume functionality by pulsing signal */
		/* Enable auto-resume functionality only when
		* there is some peripheral connected and real
		* bus suspend happened
		*/
		if ((phy->phy.flags & PHY_HSFS_MODE) \|\|
		(phy->phy.flags & PHY_LS_MODE)) {
		/* Enable auto-resume functionality by pulsing
		* signal
		*/
		msm_usb_write_readback(phy->base,
		USB2_PHY_USB_PHY_HS_PHY_CTRL2,
		USB2_AUTO_RESUME, USB2_AUTO_RESUME);
		@@ -495,7 +503,7 @@ static int msm_hsphy_set_suspend(struct usb_phy *uphy, int suspend)
		msm_usb_write_readback(phy->base,
		USB2_PHY_USB_PHY_HS_PHY_CTRL2,
		USB2_AUTO_RESUME, 0);

		}
		msm_hsphy_enable_clocks(phy, false);
		} else {/* Cable disconnect */
		mutex_lock(&phy->phy_lock);