diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-07 16:40:02 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-08 11:43:23 -0600 |
| commit | ff61d6bfd1c9534d3fc2397846a5899639f2e55d (patch) | |
| tree | dcfe4bc52848a5637c975a3352b57885e5b8a06d /drivers/usb/cdns3/drd.c | |
| parent | 34820924edbc4ec7803eb89d9852f4b870fa760a (diff) | |
| parent | f892a7f397a66d8d09f418d1e0e06dfb48bac27d (diff) | |
Merge branch 'next'
Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.
Diffstat (limited to 'drivers/usb/cdns3/drd.c')
| -rw-r--r-- | drivers/usb/cdns3/drd.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c index 47874fec29e..cbb13342343 100644 --- a/drivers/usb/cdns3/drd.c +++ b/drivers/usb/cdns3/drd.c @@ -217,15 +217,19 @@ static int cdns3_init_otg_mode(struct cdns3 *cdns) int cdns3_drd_update_mode(struct cdns3 *cdns) { int ret = 0; + int mode; switch (cdns->dr_mode) { case USB_DR_MODE_PERIPHERAL: + mode = PHY_MODE_USB_DEVICE; ret = cdns3_set_mode(cdns, USB_DR_MODE_PERIPHERAL); break; case USB_DR_MODE_HOST: + mode = PHY_MODE_USB_HOST; ret = cdns3_set_mode(cdns, USB_DR_MODE_HOST); break; case USB_DR_MODE_OTG: + mode = PHY_MODE_USB_OTG; ret = cdns3_init_otg_mode(cdns); break; default: @@ -234,6 +238,16 @@ int cdns3_drd_update_mode(struct cdns3 *cdns) return -EINVAL; } + ret = generic_phy_set_mode(&cdns->usb2_phy, mode, 0); + if (ret) { + dev_err(cdns->dev, "Set usb 2.0 PHY mode failed %d\n", ret); + return ret; + } + + ret = generic_phy_set_mode(&cdns->usb3_phy, mode, 0); + if (ret) + dev_err(cdns->dev, "Set usb 3.0 PHY mode failed %d\n", ret); + return ret; } |