nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3513 from chrenderle/rcc-msik

Browse Source 
RCC: added msik for stm32u5
This commit is contained in:
Dario Nieuwenhuis 2024-11-07 12:35:05 +00:00 committed by GitHub
commit 9032cc0081
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
embassy-stm32/src/rcc/u5.rs
View File

@ -62,7 +62,8 @@ pub struct Pll {
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub struct Config { pub struct Config {
// base clock sources // base clock sources
pub msi: Option<MSIRange>, pub msis: Option<MSIRange>,
pub msik: Option<MSIRange>,
pub hsi: bool, pub hsi: bool,
pub hse: Option<Hse>, pub hse: Option<Hse>,
pub hsi48: Option<super::Hsi48Config>, pub hsi48: Option<super::Hsi48Config>,
@ -94,7 +95,8 @@ pub struct Config {
impl Default for Config { impl Default for Config {
fn default() -> Self { fn default() -> Self {
Self { Self {
msi: Some(Msirange::RANGE_4MHZ), msis: Some(Msirange::RANGE_4MHZ),
msik: Some(Msirange::RANGE_4MHZ),
hse: None, hse: None,
hsi: false, hsi: false,
hsi48: Some(Default::default()), hsi48: Some(Default::default()),
@ -118,7 +120,7 @@ pub(crate) unsafe fn init(config: Config) {
PWR.vosr().modify(|w| w.set_vos(config.voltage_range)); PWR.vosr().modify(|w| w.set_vos(config.voltage_range));
while !PWR.vosr().read().vosrdy() {} while !PWR.vosr().read().vosrdy() {}
let msi = config.msi.map(|range| { let msis = config.msis.map(|range| {
// Check MSI output per RM0456 § 11.4.10 // Check MSI output per RM0456 § 11.4.10
match config.voltage_range { match config.voltage_range {
VoltageScale::RANGE4 => { VoltageScale::RANGE4 => {
@ -147,6 +149,34 @@ pub(crate) unsafe fn init(config: Config) {
msirange_to_hertz(range) msirange_to_hertz(range)
}); });
let msik = config.msik.map(|range| {
// Check MSI output per RM0456 § 11.4.10
match config.voltage_range {
VoltageScale::RANGE4 => {
assert!(msirange_to_hertz(range).0 <= 24_000_000);
}
_ => {}
}
// RM0456 § 11.8.2: spin until MSIS is off or MSIS is ready before setting its range
loop {
let cr = RCC.cr().read();
if cr.msikon() == false || cr.msikrdy() == true {
break;
}
}
RCC.icscr1().modify(|w| {
w.set_msikrange(range);
w.set_msirgsel(Msirgsel::ICSCR1);
});
RCC.cr().write(|w| {
w.set_msikon(true);
});
while !RCC.cr().read().msikrdy() {}
msirange_to_hertz(range)
});
let hsi = config.hsi.then(|| { let hsi = config.hsi.then(|| {
RCC.cr().write(|w| w.set_hsion(true)); RCC.cr().write(|w| w.set_hsion(true));
while !RCC.cr().read().hsirdy() {} while !RCC.cr().read().hsirdy() {}
@ -181,7 +211,7 @@ pub(crate) unsafe fn init(config: Config) {
let hsi48 = config.hsi48.map(super::init_hsi48); let hsi48 = config.hsi48.map(super::init_hsi48);
let pll_input = PllInput { hse, hsi, msi }; let pll_input = PllInput { hse, hsi, msi: msis };
let pll1 = init_pll(PllInstance::Pll1, config.pll1, &pll_input, config.voltage_range); let pll1 = init_pll(PllInstance::Pll1, config.pll1, &pll_input, config.voltage_range);
let pll2 = init_pll(PllInstance::Pll2, config.pll2, &pll_input, config.voltage_range); let pll2 = init_pll(PllInstance::Pll2, config.pll2, &pll_input, config.voltage_range);
let pll3 = init_pll(PllInstance::Pll3, config.pll3, &pll_input, config.voltage_range); let pll3 = init_pll(PllInstance::Pll3, config.pll3, &pll_input, config.voltage_range);
@ -189,7 +219,7 @@ pub(crate) unsafe fn init(config: Config) {
let sys_clk = match config.sys { let sys_clk = match config.sys {
Sysclk::HSE => hse.unwrap(), Sysclk::HSE => hse.unwrap(),
Sysclk::HSI => hsi.unwrap(), Sysclk::HSI => hsi.unwrap(),
Sysclk::MSIS => msi.unwrap(), Sysclk::MSIS => msis.unwrap(),
Sysclk::PLL1_R => pll1.r.unwrap(), Sysclk::PLL1_R => pll1.r.unwrap(),
}; };
@ -276,6 +306,7 @@ pub(crate) unsafe fn init(config: Config) {
pclk3: Some(pclk3), pclk3: Some(pclk3),
pclk1_tim: Some(pclk1_tim), pclk1_tim: Some(pclk1_tim),
pclk2_tim: Some(pclk2_tim), pclk2_tim: Some(pclk2_tim),
msik: msik,
hsi48: hsi48, hsi48: hsi48,
rtc: rtc, rtc: rtc,
hse: hse, hse: hse,
@ -300,7 +331,6 @@ pub(crate) unsafe fn init(config: Config) {
hsi48_div_2: None, hsi48_div_2: None,
lse: None, lse: None,
lsi: None, lsi: None,
msik: None,
shsi: None, shsi: None,
shsi_div_2: None, shsi_div_2: None,
); );