diff options
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/wba.rs | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index c4322b9ba..39e6f13f0 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -81,7 +81,7 @@ futures-util = { version = "0.3.30", default-features = false } | |||
| 81 | sdio-host = "0.9.0" | 81 | sdio-host = "0.9.0" |
| 82 | critical-section = "1.1" | 82 | critical-section = "1.1" |
| 83 | #stm32-metapac = { version = "16" } | 83 | #stm32-metapac = { version = "16" } |
| 84 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-a236d845991bb48198427e08dc61ae3e257057a8" } | 84 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9941f338734a2e6c1652267f64b13f7b35d8c9db" } |
| 85 | 85 | ||
| 86 | vcell = "0.1.3" | 86 | vcell = "0.1.3" |
| 87 | nb = "1.0.0" | 87 | nb = "1.0.0" |
| @@ -110,7 +110,7 @@ proc-macro2 = "1.0.36" | |||
| 110 | quote = "1.0.15" | 110 | quote = "1.0.15" |
| 111 | 111 | ||
| 112 | #stm32-metapac = { version = "16", default-features = false, features = ["metadata"]} | 112 | #stm32-metapac = { version = "16", default-features = false, features = ["metadata"]} |
| 113 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-a236d845991bb48198427e08dc61ae3e257057a8", default-features = false, features = ["metadata"] } | 113 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-9941f338734a2e6c1652267f64b13f7b35d8c9db", default-features = false, features = ["metadata"] } |
| 114 | 114 | ||
| 115 | [features] | 115 | [features] |
| 116 | default = ["rt"] | 116 | default = ["rt"] |
diff --git a/embassy-stm32/src/rcc/wba.rs b/embassy-stm32/src/rcc/wba.rs index 56ba7b58b..481437939 100644 --- a/embassy-stm32/src/rcc/wba.rs +++ b/embassy-stm32/src/rcc/wba.rs | |||
| @@ -5,7 +5,7 @@ pub use crate::pac::rcc::vals::Otghssel; | |||
| 5 | use crate::pac::rcc::vals::Pllrge; | 5 | use crate::pac::rcc::vals::Pllrge; |
| 6 | pub use crate::pac::rcc::vals::{ | 6 | pub use crate::pac::rcc::vals::{ |
| 7 | Hdiv5, Hpre as AHBPrescaler, Hpre5 as AHB5Prescaler, Hsepre as HsePrescaler, Plldiv as PllDiv, Pllm as PllPreDiv, | 7 | Hdiv5, Hpre as AHBPrescaler, Hpre5 as AHB5Prescaler, Hsepre as HsePrescaler, Plldiv as PllDiv, Pllm as PllPreDiv, |
| 8 | Plln as PllMul, Pllsrc as PllSource, Ppre as APBPrescaler, Sw as Sysclk, | 8 | Plln as PllMul, Pllsrc as PllSource, Ppre as APBPrescaler, Sai1sel, Sw as Sysclk, |
| 9 | }; | 9 | }; |
| 10 | #[cfg(all(peri_usb_otg_hs))] | 10 | #[cfg(all(peri_usb_otg_hs))] |
| 11 | pub use crate::pac::{syscfg::vals::Usbrefcksel, SYSCFG}; | 11 | pub use crate::pac::{syscfg::vals::Usbrefcksel, SYSCFG}; |
| @@ -254,6 +254,16 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 254 | w.set_clksel(usb_refck_sel); | 254 | w.set_clksel(usb_refck_sel); |
| 255 | }); | 255 | }); |
| 256 | 256 | ||
| 257 | #[cfg(sai_v4_2pdm)] | ||
| 258 | let audioclk = match config.mux.sai1sel { | ||
| 259 | Sai1sel::HSI => Some(HSI_FREQ), | ||
| 260 | Sai1sel::PLL1_Q => Some(pll1.q.expect("PLL1.Q not configured")), | ||
| 261 | Sai1sel::PLL1_P => Some(pll1.p.expect("PLL1.P not configured")), | ||
| 262 | Sai1sel::SYS => panic!("SYS not supported yet"), | ||
| 263 | Sai1sel::AUDIOCLK => panic!("AUDIOCLK not supported yet"), | ||
| 264 | _ => None, | ||
| 265 | }; | ||
| 266 | |||
| 257 | let lsi = config.ls.lsi.then_some(LSI_FREQ); | 267 | let lsi = config.ls.lsi.then_some(LSI_FREQ); |
| 258 | 268 | ||
| 259 | config.mux.init(); | 269 | config.mux.init(); |
| @@ -279,6 +289,8 @@ pub(crate) unsafe fn init(config: Config) { | |||
| 279 | 289 | ||
| 280 | // TODO | 290 | // TODO |
| 281 | lse: None, | 291 | lse: None, |
| 292 | #[cfg(sai_v4_2pdm)] | ||
| 293 | audioclk: audioclk, | ||
| 282 | ); | 294 | ); |
| 283 | } | 295 | } |
| 284 | 296 | ||
