diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:50 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:50 +0300 |
| commit | 31ceb6e263c07d60f73fa982e3d16d142fa1a70d (patch) | |
| tree | f5eec7c1f1e7b314476c4110aa8dd7dbf2c5f261 | |
| parent | cc0176699cd10e5c54a870531ca77d072416f447 (diff) | |
| parent | 42c03cb9688e004b3ba2f433a616881f04eded36 (diff) | |
| download | linux-31ceb6e263c07d60f73fa982e3d16d142fa1a70d.tar.gz | |
Merge branch 6.1/features/usb
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
| -rw-r--r-- | drivers/usb/dwc3/dwc3-pci.c | 3 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index ae25ee832ec0..6a44bb54f53d 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -174,9 +174,8 @@ static const struct property_entry dwc3_pci_amd_properties[] = { static const struct property_entry dwc3_pci_mr_properties[] = { PROPERTY_ENTRY_STRING("dr_mode", "otg"), - PROPERTY_ENTRY_BOOL("usb-role-switch"), - PROPERTY_ENTRY_STRING("role-switch-default-mode", "host"), PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"), + PROPERTY_ENTRY_STRING("linux,extcon-name", "steamdeck-extcon"), {} }; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 137602d9076f..60365ac69cec 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2317,7 +2317,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc) } /* poll until Link State changes to ON */ - retries = 20000; + retries = 2000000; while (retries--) { reg = dwc3_readl(dwc->regs, DWC3_DSTS); |