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: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 6ac850d6ad44400820f26c9c56c2b5753521dad6..9b737c4e8f507106cc59e96f19e9a7123c5b0560 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -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);
 }