Enable USB PHYs a bit earlier and re-enable OhciDxe

There's no clear dependency set here. It may be better to register a protocol for this instead.
edk2-porting · Mar 24, 2023 · f386fdb · f386fdb
1 parent 8249a40
commit f386fdb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/edk2-platforms/Platform/OrangePi/OrangePi5/Drivers/RK3588Dxe_opi5/RK3588Dxe.c b/edk2-platforms/Platform/OrangePi/OrangePi5/Drivers/RK3588Dxe_opi5/RK3588Dxe.c
@@ -498,6 +498,12 @@ RK3588InitPeripherals (
 
   // GmacIomuxInit();
 
+  /* Enable USB PHYs */
+  Usb2PhyResume (); 
+  UsbDpPhyEnable ();
+
+  UsbPortPowerEnable ();
+
   return EFI_SUCCESS;
 }
 

diff --git a/edk2-platforms/Platform/OrangePi/OrangePi5/OrangePi5.dsc b/edk2-platforms/Platform/OrangePi/OrangePi5/OrangePi5.dsc
@@ -453,7 +453,7 @@
   #
   # USB Ohci Controller
   #
-  #Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
+  Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
 
   #
   # USB Ehci Controller

diff --git a/edk2-platforms/Platform/OrangePi/OrangePi5/OrangePi5.fdf b/edk2-platforms/Platform/OrangePi/OrangePi5/OrangePi5.fdf
@@ -185,7 +185,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # USB Ohci Controller
   #
-  #INF Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
+  INF Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
 
   #
   # USB Dwc3 Controller

diff --git a/edk2-platforms/Platform/Radxa/ROCK5B/Drivers/RK3588Dxe_rock5b/RK3588Dxe.c b/edk2-platforms/Platform/Radxa/ROCK5B/Drivers/RK3588Dxe_rock5b/RK3588Dxe.c
@@ -486,6 +486,12 @@ RK3588InitPeripherals (
 
   ComboPhyInit();
 
+  /* Enable USB PHYs */
+  Usb2PhyResume (); 
+  UsbDpPhyEnable ();
+
+  UsbPortPowerEnable ();
+
   return EFI_SUCCESS;
 }
 

diff --git a/edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.dsc b/edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.dsc
@@ -453,7 +453,7 @@
   #
   # USB Ohci Controller
   #
-  #Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
+  Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
 
   #
   # USB Ehci Controller

diff --git a/edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.fdf b/edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.fdf
@@ -185,7 +185,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # USB Ohci Controller
   #
-  #INF Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
+  INF Silicon/Rockchip/Drivers/OhciDxe/OhciDxe.inf
 
   #
   # USB Dwc3 Controller

diff --git a/edk2-platforms/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.c b/edk2-platforms/Silicon/Rockchip/Drivers/UsbHcdInitDxe/UsbHcd.c
@@ -258,13 +258,6 @@ UsbEndOfDxeCallback (
 
   NumUsb2Controller = PcdGet32 (PcdNumEhciController);
 
-  /* Enable USB PHYs */
-  Usb2PhyResume();
-
-  UsbDpPhyEnable();
-
-  UsbPortPowerEnable ();
-
   /* Register USB3 controllers */
   for (Index = 0; Index < XhciControllerAddrArraySize; Index += sizeof(UINT32)) {
     XhciControllerAddr = XhciControllerAddrArrayPtr[Index] |