1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From fb26b553bf2627ff96c38236daab0138a82c613a Mon Sep 17 00:00:00 2001
|
|
From: Jules Maselbas <jmaselbas@kalray.eu>
|
|
Date: Fri, 5 Apr 2019 15:35:30 +0200
|
|
Subject: [PATCH 34/53] 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>
|
|
---
|
|
drivers/usb/dwc2/gadget.c | 13 -------------
|
|
1 file changed, 13 deletions(-)
|
|
|
|
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
|
|
index 6ac850d6ad44..9b737c4e8f50 100644
|
|
--- 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);
|
|
}
|
|
--
|
|
2.11.0
|
|
|