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

Commit 5476148f authored by Azhar Shaikh's avatar Azhar Shaikh
Browse files

usb: dwc3-msm: Remove use of QSCRATCH_CTRL_REG 



QSCRATCH_CTRL_REG was used to restore the POR value after
userspace was done with charger detection. Since on newer platforms
charger detection is handled by dedicated charging hardware, hence
userapce charging is not needed. So remove this dead code.

Change-Id: Ie2baa1855315d044653d338ea2cf8a31efc8f08a
Signed-off-by: default avatarAzhar Shaikh <azhars@codeaurora.org>
parent 4c5e5900

drivers/usb/dwc3/dwc3-msm.c

+0 −12
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ MODULE_PARM_DESC(dcp_max_current, "max current drawn for DCP charger"); 
 *

 */

#define QSCRATCH_REG_OFFSET	(0x000F8800)

#define QSCRATCH_CTRL_REG      (QSCRATCH_REG_OFFSET + 0x04)

#define QSCRATCH_GENERAL_CFG	(QSCRATCH_REG_OFFSET + 0x08)

#define CGCTL_REG		(QSCRATCH_REG_OFFSET + 0x28)

#define PWR_EVNT_IRQ_STAT_REG    (QSCRATCH_REG_OFFSET + 0x58)
@@ -210,7 +209,6 @@ struct dwc3_msm { 
#define MDWC3_POWER_COLLAPSE		BIT(3)

#define MDWC3_CORECLK_OFF		BIT(4)



	u32 qscratch_ctl_val;

	bool suspend_resume_no_support;



	bool power_collapse; /* power collapse on cable disconnect */
@@ -1062,12 +1060,6 @@ static void dwc3_msm_qscratch_reg_init(struct dwc3_msm *mdwc) 
	dwc3_msm_write_reg(mdwc->base, CGCTL_REG,

		dwc3_msm_read_reg(mdwc->base, CGCTL_REG) | 0x18);



	/*

	 * This is required to restore the POR value after userspace

	 * is done with charger detection.

	 */

	mdwc->qscratch_ctl_val =

		dwc3_msm_read_reg(mdwc->base, QSCRATCH_CTRL_REG);

}



static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned event)
@@ -1392,10 +1384,6 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc) 
	if (dwc->irq)

		disable_irq(dwc->irq);



	if (!dcp && !mdwc->in_host_mode)

		dwc3_msm_write_reg(mdwc->base, QSCRATCH_CTRL_REG,

			mdwc->qscratch_ctl_val);



	/* Enable wakeup from LPM */

	if (mdwc->pwr_event_irq) {

		disable_irq(mdwc->pwr_event_irq);