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

Merge pull request #1932 from embassy-rs/h7fix

Browse Source 
stm32/h7: fix bad PWR reg versions.
This commit is contained in:
Dario Nieuwenhuis 2023-09-20 22:28:09 +00:00 committed by GitHub
commit 766ae724cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-stm32/src/rcc/h7.rs
View File

@ -464,14 +464,14 @@ pub(crate) unsafe fn init(mut config: Config) {
// RM0433 Rev 7 6.8.4. This is partially enforced by dropping // RM0433 Rev 7 6.8.4. This is partially enforced by dropping
// `self` at the end of this method, but of course we cannot // `self` at the end of this method, but of course we cannot
// know what happened between the previous POR and here. // know what happened between the previous POR and here.
#[cfg(pwr_h7)] #[cfg(pwr_h7rm0433)]
PWR.cr3().modify(|w| { PWR.cr3().modify(|w| {
w.set_scuen(true); w.set_scuen(true);
w.set_ldoen(true); w.set_ldoen(true);
w.set_bypass(false); w.set_bypass(false);
}); });
#[cfg(pwr_h7smps)] #[cfg(any(pwr_h7rm0399, pwr_h7rm0455, pwr_h7rm0468))]
PWR.cr3().modify(|w| { PWR.cr3().modify(|w| {
// hardcode "Direct SPMS" for now, this is what works on nucleos with the // hardcode "Direct SPMS" for now, this is what works on nucleos with the
// default solderbridge configuration. // default solderbridge configuration.
@ -484,7 +484,9 @@ pub(crate) unsafe fn init(mut config: Config) {
// in the D3CR.VOS and CR3.SDLEVEL fields. By default after reset // in the D3CR.VOS and CR3.SDLEVEL fields. By default after reset
// VOS = Scale 3, so check that the voltage on the VCAP pins = // VOS = Scale 3, so check that the voltage on the VCAP pins =
// 1.0V. // 1.0V.
info!("a");
while !PWR.csr1().read().actvosrdy() {} while !PWR.csr1().read().actvosrdy() {}
info!("b");
#[cfg(syscfg_h7)] #[cfg(syscfg_h7)]
{ {