max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/rcc: add plli2s to Clocks and cfg directives

Browse Source
This commit is contained in:
xoviat 2023-04-14 16:30:36 -05:00
parent c1d5f86871
commit 650589ab3f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embassy-stm32/src/rcc/f4.rs
View File

@ -28,6 +28,8 @@ pub struct Config {
pub sys_ck: Option<Hertz>, pub sys_ck: Option<Hertz>,
pub pclk1: Option<Hertz>, pub pclk1: Option<Hertz>,
pub pclk2: Option<Hertz>, pub pclk2: Option<Hertz>,
#[cfg(not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446)))]
pub plli2s: Option<Hertz>, pub plli2s: Option<Hertz>,
pub pll48: bool, pub pll48: bool,
@ -342,7 +344,10 @@ pub(crate) unsafe fn init(config: Config) {
pllsrcclk, pllsrcclk,
config.hse.is_some(), config.hse.is_some(),
if sysclk_on_pll { Some(sysclk) } else { None }, if sysclk_on_pll { Some(sysclk) } else { None },
#[cfg(not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446)))]
config.plli2s.map(|i2s| i2s.0), config.plli2s.map(|i2s| i2s.0),
#[cfg(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446))]
None,
config.pll48, config.pll48,
); );
@ -473,6 +478,9 @@ pub(crate) unsafe fn init(config: Config) {
ahb3: Hertz(hclk), ahb3: Hertz(hclk),
pll48: plls.pll48clk.map(Hertz), pll48: plls.pll48clk.map(Hertz),
#[cfg(not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446)))]
plli2s: plls.plli2sclk.map(Hertz),
}); });
} }

3
embassy-stm32/src/rcc/mod.rs
View File

@ -60,6 +60,9 @@ pub struct Clocks {
#[cfg(any(rcc_f2, rcc_f4, rcc_f410, rcc_f7))] #[cfg(any(rcc_f2, rcc_f4, rcc_f410, rcc_f7))]
pub pll48: Option<Hertz>, pub pll48: Option<Hertz>,
#[cfg(all(stm32f4, not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446))))]
pub plli2s: Option<Hertz>,
#[cfg(stm32f1)] #[cfg(stm32f1)]
pub adc: Hertz, pub adc: Hertz,