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

Merge pull request #3937 from 0e4ef622/nrf53-vreghvout

Browse Source 
nrf5340: add regh_voltage config
This commit is contained in:
Dario Nieuwenhuis 2025-03-02 21:12:30 +00:00 committed by GitHub
commit 75c1ca2fa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
embassy-nrf/src/lib.rs
View File

@ -347,12 +347,33 @@ pub mod config {
pub struct DcdcConfig { pub struct DcdcConfig {
/// Config for the high voltage stage, if disabled LDO will be used. /// Config for the high voltage stage, if disabled LDO will be used.
pub regh: bool, pub regh: bool,
/// Configure the voltage of the high voltage stage. It is stored in non-volatile memory (UICR.VREGHVOUT register); pass None to not touch it.
#[cfg(feature = "nrf5340-app-s")]
pub regh_voltage: Option<ReghVoltage>,
/// Config for the main rail, if disabled LDO will be used. /// Config for the main rail, if disabled LDO will be used.
pub regmain: bool, pub regmain: bool,
/// Config for the radio rail, if disabled LDO will be used. /// Config for the radio rail, if disabled LDO will be used.
pub regradio: bool, pub regradio: bool,
} }
/// Output voltage setting for VREGH regulator stage.
#[cfg(feature = "nrf5340-app-s")]
pub enum ReghVoltage {
/// 1.8 V
_1V8 = 0,
/// 2.1 V
_2V1 = 1,
/// 2.4 V
_2V4 = 2,
/// 2.7 V
_2V7 = 3,
/// 3.0 V
_3V0 = 4,
/// 3.3 V
_3v3 = 5,
//ERASED = 7, means 1.8V
}
/// Settings for enabling the built in DCDC converter. /// Settings for enabling the built in DCDC converter.
#[cfg(feature = "_nrf91")] #[cfg(feature = "_nrf91")]
pub struct DcdcConfig { pub struct DcdcConfig {
@ -399,6 +420,8 @@ pub mod config {
#[cfg(feature = "_nrf5340-app")] #[cfg(feature = "_nrf5340-app")]
dcdc: DcdcConfig { dcdc: DcdcConfig {
regh: false, regh: false,
#[cfg(feature = "nrf5340-app-s")]
regh_voltage: None,
regmain: false, regmain: false,
regradio: false, regradio: false,
}, },
@ -431,6 +454,7 @@ mod consts {
#[allow(unused)] #[allow(unused)]
mod consts { mod consts {
pub const UICR_APPROTECT: *mut u32 = 0x00FF8000 as *mut u32; pub const UICR_APPROTECT: *mut u32 = 0x00FF8000 as *mut u32;
pub const UICR_VREGHVOUT: *mut u32 = 0x00FF8010 as *mut u32;
pub const UICR_SECUREAPPROTECT: *mut u32 = 0x00FF801C as *mut u32; pub const UICR_SECUREAPPROTECT: *mut u32 = 0x00FF801C as *mut u32;
pub const UICR_NFCPINS: *mut u32 = 0x00FF8028 as *mut u32; pub const UICR_NFCPINS: *mut u32 = 0x00FF8028 as *mut u32;
pub const APPROTECT_ENABLED: u32 = 0x0000_0000; pub const APPROTECT_ENABLED: u32 = 0x0000_0000;
@ -683,6 +707,21 @@ pub fn init(config: config::Config) -> Peripherals {
} }
} }
#[cfg(feature = "nrf5340-app-s")]
unsafe {
if let Some(value) = config.dcdc.regh_voltage {
let value = value as u32;
let res = uicr_write_masked(consts::UICR_VREGHVOUT, value, 0b00000000_00000000_00000000_00000111);
needs_reset |= res == WriteResult::Written;
if res == WriteResult::Failed {
warn!(
"Failed to set regulator voltage, as UICR is already programmed to some other setting, and can't be changed without erasing it.\n\
To fix this, erase UICR manually, for example using `probe-rs erase` or `nrfjprog --eraseuicr`."
);
}
}
}
if needs_reset { if needs_reset {
cortex_m::peripheral::SCB::sys_reset(); cortex_m::peripheral::SCB::sys_reset();
} }