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

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

Merge "usb: phy: msm: Add USB HSPHY out of retention support"

parents eb374c42 e041930a

drivers/usb/dwc3/dwc3-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ MODULE_PARM_DESC(usb_lpm_override, "Override no_suspend_resume with USB"); 
#define SS_CR_PROTOCOL_WRITE_REG    (QSCRATCH_REG_OFFSET + 0x50)

#define PWR_EVNT_IRQ_STAT_REG    (QSCRATCH_REG_OFFSET + 0x58)

#define PWR_EVNT_IRQ_MASK_REG    (QSCRATCH_REG_OFFSET + 0x5C)

#define HS_PHY_CTRL_COMMON_REG	(QSCRATCH_REG_OFFSET + 0xEC)



/* TZ SCM parameters */

#define DWC3_MSM_RESTORE_SCM_CFG_CMD 0x2

drivers/usb/phy/phy-msm-hsusb.c

+15 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ MODULE_PARM_DESC(override_phy_init, "Override HSPHY Init Seq"); 
#define FREECLOCK_SEL			BIT(29)



/* HS_PHY_CTRL_COMMON_REG bits used when core_ver >= MSM_CORE_VER_120 */

#define COMMON_PLLITUNE_1		BIT(18)

#define COMMON_PLLBTUNE		BIT(15)

#define COMMON_CLKCORE			BIT(14)

#define COMMON_VBUSVLDEXTSEL0		BIT(12)
@@ -350,7 +351,11 @@ static int msm_hsphy_set_suspend(struct usb_phy *uphy, int suspend) 
					(OTGDISABLE0 | USB2_SUSPEND_N_SEL |

					 USB2_SUSPEND_N),

					(OTGDISABLE0 | USB2_SUSPEND_N_SEL));

			if (!chg_connected)

			/*

			 * Enable PHY retention

			 * RETENABLEN bit is not available on few platforms.

			 */

			if (!chg_connected && !phy->set_pllbtune)

				/* Enable PHY retention */

				msm_usb_write_readback(phy->base,

							HS_PHY_CTRL_REG,
@@ -407,8 +412,16 @@ static int msm_hsphy_set_suspend(struct usb_phy *uphy, int suspend) 
							DPDMHV_INT_MASK, 0);

		} else {

			/* Disable PHY retention */

			msm_usb_write_readback(phy->base, HS_PHY_CTRL_REG,

			if (phy->set_pllbtune) {

				msm_usb_write_readback(phy->base,

						HS_PHY_CTRL_COMMON_REG,

						COMMON_PLLITUNE_1, 0);

			} else {

				msm_usb_write_readback(phy->base,

						HS_PHY_CTRL_REG,

						RETENABLEN, RETENABLEN);

			}



			/* Bring PHY out of suspend */

			msm_usb_write_readback(phy->base, HS_PHY_CTRL_REG,

						(OTGDISABLE0 |