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

Commit fb26b553 authored by Jules Maselbas's avatar Jules Maselbas Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: Remove duplicated phy init 



The function dwc2_hsotg_init is only called once just before calling
dwc2_hsotg_core_init_disconnected which does the same initialization:
setting the usbcfg register with turnaround time, timeout calibration
and phy width.

Acked-by: default avatarMinas Harutyunyan <hminas@synopsys.com>
Signed-off-by: default avatarJules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent a89bae70

drivers/usb/dwc2/gadget.c

+0 −13
Original line number Diff line number Diff line
@@ -4328,8 +4328,6 @@ static const struct usb_ep_ops dwc2_hsotg_ep_ops = { 
 */

static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg)

{

	u32 trdtim;

	u32 usbcfg;

	/* unmask subset of endpoint interrupts */



	dwc2_writel(hsotg, DIEPMSK_TIMEOUTMSK | DIEPMSK_AHBERRMSK |
@@ -4353,17 +4351,6 @@ static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg) 


	dwc2_hsotg_init_fifo(hsotg);



	/* keep other bits untouched (so e.g. forced modes are not lost) */

	usbcfg = dwc2_readl(hsotg, GUSBCFG);

	usbcfg &= ~(GUSBCFG_TOUTCAL_MASK | GUSBCFG_PHYIF16 | GUSBCFG_SRPCAP |

		GUSBCFG_HNPCAP | GUSBCFG_USBTRDTIM_MASK);



	/* set the PLL on, remove the HNP/SRP and set the PHY */

	trdtim = (hsotg->phyif == GUSBCFG_PHYIF8) ? 9 : 5;

	usbcfg |= hsotg->phyif | GUSBCFG_TOUTCAL(7) |

		(trdtim << GUSBCFG_USBTRDTIM_SHIFT);

	dwc2_writel(hsotg, usbcfg, GUSBCFG);



	if (using_dma(hsotg))

		dwc2_set_bit(hsotg, GAHBCFG, GAHBCFG_DMA_EN);

}