Skip to content

Commit a8735c4

Browse files
committed
Revert "usb: dwc3: apple: Do not use host-vbus-glitches workaround"
This reverts commit d899d4d.
1 parent aa7aced commit a8735c4

3 files changed

Lines changed: 1 addition & 7 deletions

File tree

drivers/usb/dwc3/core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2273,7 +2273,6 @@ int dwc3_core_probe(const struct dwc3_probe_data *data)
22732273

22742274
dwc->dr_mode = USB_DR_MODE_OTG;
22752275
dwc->role_switch_reset_quirk = true;
2276-
dwc->no_early_roothub_poweroff = true;
22772276
}
22782277
}
22792278

drivers/usb/dwc3/core.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,6 @@ struct dwc3_scratchpad_array {
11551155
* @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY
11561156
* before PM suspend.
11571157
* @role_switch_reset_quirk: set to force reinitialization after any role switch
1158-
* @no_early_roothub_poweroff: set to skip early root hub port power off
11591158
* @imod_interval: set the interrupt moderation interval in 250ns
11601159
* increments or 0 to disable.
11611160
* @max_cfg_eps: current max number of IN eps used across all USB configs.
@@ -1395,7 +1394,6 @@ struct dwc3 {
13951394
unsigned susphy_state:1;
13961395

13971396
unsigned role_switch_reset_quirk:1;
1398-
unsigned no_early_roothub_poweroff:1;
13991397

14001398
u16 imod_interval;
14011399

drivers/usb/dwc3/host.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,8 @@ int dwc3_host_init(struct dwc3 *dwc)
137137
/*
138138
* Some platforms need to power off all Root hub ports immediately after DWC3 set to host
139139
* mode to avoid VBUS glitch happen when xhci get reset later.
140-
* On Apple platforms we must not touch any MMIO yet because dwc3
141-
* will not work correctly before its PHY has been initialized.
142140
*/
143-
if (!dwc->no_early_roothub_poweroff)
144-
dwc3_power_off_all_roothub_ports(dwc);
141+
dwc3_power_off_all_roothub_ports(dwc);
145142

146143
irq = dwc3_host_get_irq(dwc);
147144
if (irq < 0)

0 commit comments

Comments
 (0)