Working USB_OTG_HS example for STM32WBA

3 files changed, 6 insertions, 11 deletions

diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index d893f1b54..a676677e1 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -546,7 +546,11 @@ fn init_hw(config: Config) -> Peripherals {
         {
             use crate::pac::pwr::vals;
             crate::pac::PWR.svmcr().modify(|w| {
-                w.set_io2sv(if config.enable_independent_io_supply {vals::Io2sv::B_0X1} else {vals::Io2sv::B_0X0});
+                w.set_io2sv(if config.enable_independent_io_supply {
+                    vals::Io2sv::B_0X1
+                } else {
+                    vals::Io2sv::B_0X0
+                });
             });
         }
         #[cfg(stm32u5)]
diff --git a/embassy-stm32/src/usb/mod.rs b/embassy-stm32/src/usb/mod.rs
index d052934f8..62c751ac8 100644
--- a/embassy-stm32/src/usb/mod.rs
+++ b/embassy-stm32/src/usb/mod.rs
@@ -111,10 +111,8 @@ fn common_init<T: Instance>() {
             });
             crate::pac::PWR.vosr().modify(|w| {
                 w.set_vdd11usbdis(false);
-            });
-            crate::pac::PWR.vosr().modify(|w| {
                 w.set_usbpwren(true);
-            })
+            });
         });
 
         // Wait for USB power to stabilize
diff --git a/embassy-stm32/src/usb/otg.rs b/embassy-stm32/src/usb/otg.rs
index abf54cbad..1c3b99b93 100644
--- a/embassy-stm32/src/usb/otg.rs
+++ b/embassy-stm32/src/usb/otg.rs
@@ -330,19 +330,12 @@ impl<'d, T: Instance> Bus<'d, T> {
         #[cfg(all(stm32wba, peri_usb_otg_hs))]
         {
             critical_section::with(|_| {
-                // crate::pac::RCC.apb7enr().modify(|w| {
-                //     w.set_syscfgen(true);
-                // });
                 crate::pac::RCC.ahb2enr().modify(|w| {
                     w.set_usb_otg_hsen(true);
                     w.set_usb_otg_hs_phyen(true);
                 });
             });
 
-            // pub use crate::pac::rcc::vals::Otghssel;
-            // // select HSE
-            // crate::pac::RCC.ccipr2().modify(|w| {w.set_otghssel(Otghssel::HSE);});
-
             crate::pac::SYSCFG.otghsphytuner2().modify(|w| {
                 w.set_compdistune(0b010);
                 w.set_sqrxtune(0b000);