NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1847 from mvniekerk/main

Browse source 
RP2040: XOSC delay multiplier
This commit is contained in:
Dario Nieuwenhuis 2023-08-30 20:00:40 +00:00 committed by GitHub
commit 2c6b428ed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
embassy-rp/src/clocks.rs
View file

@ -94,6 +94,7 @@ impl ClockConfig {
post_div1: 6, post_div1: 6,
post_div2: 5, post_div2: 5,
}), }),
delay_multiplier: 128,
}), }),
ref_clk: RefClkConfig { ref_clk: RefClkConfig {
src: RefClkSrc::Xosc, src: RefClkSrc::Xosc,
@ -203,6 +204,7 @@ pub struct XoscConfig {
pub hz: u32, pub hz: u32,
pub sys_pll: Option<PllConfig>, pub sys_pll: Option<PllConfig>,
pub usb_pll: Option<PllConfig>, pub usb_pll: Option<PllConfig>,
pub delay_multiplier: u32,
} }
pub struct PllConfig { pub struct PllConfig {
@ -363,7 +365,7 @@ pub(crate) unsafe fn init(config: ClockConfig) {
// start XOSC // start XOSC
// datasheet mentions support for clock inputs into XIN, but doesn't go into // datasheet mentions support for clock inputs into XIN, but doesn't go into
// how this is achieved. pico-sdk doesn't support this at all. // how this is achieved. pico-sdk doesn't support this at all.
start_xosc(config.hz); start_xosc(config.hz, config.delay_multiplier);
let pll_sys_freq = match config.sys_pll { let pll_sys_freq = match config.sys_pll {
Some(sys_pll_config) => configure_pll(pac::PLL_SYS, config.hz, sys_pll_config), Some(sys_pll_config) => configure_pll(pac::PLL_SYS, config.hz, sys_pll_config),
@ -624,12 +626,12 @@ pub fn clk_rtc_freq() -> u16 {
CLOCKS.rtc.load(Ordering::Relaxed) CLOCKS.rtc.load(Ordering::Relaxed)
} }
fn start_xosc(crystal_hz: u32) { fn start_xosc(crystal_hz: u32, delay_multiplier: u32) {
pac::XOSC pac::XOSC
.ctrl() .ctrl()
.write(|w| w.set_freq_range(pac::xosc::vals::CtrlFreqRange::_1_15MHZ)); .write(|w| w.set_freq_range(pac::xosc::vals::CtrlFreqRange::_1_15MHZ));
let startup_delay = ((crystal_hz / 1000) + 128) / 256; let startup_delay = (((crystal_hz / 1000) * delay_multiplier) + 128) / 256;
pac::XOSC.startup().write(|w| w.set_delay(startup_delay as u16)); pac::XOSC.startup().write(|w| w.set_delay(startup_delay as u16));
pac::XOSC.ctrl().write(|w| { pac::XOSC.ctrl().write(|w| {
w.set_freq_range(pac::xosc::vals::CtrlFreqRange::_1_15MHZ); w.set_freq_range(pac::xosc::vals::CtrlFreqRange::_1_15MHZ);