ensure that clock init happens after rtc domain is initialized (#2104)

This commit is contained in:
Scott Mabin 2024-09-06 06:58:35 -07:00 committed by GitHub
parent 93f1012663
commit a3f734028a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -736,13 +736,6 @@ pub struct Config {
pub fn init(config: Config) -> Peripherals {
let mut peripherals = Peripherals::take();
Clocks::init(config.cpu_clock);
#[cfg(xtensa)]
crate::interrupt::setup_interrupts();
#[cfg(esp32)]
crate::time::time_init();
// RTC domain must be enabled before we try to disable
let mut rtc = crate::rtc_cntl::Rtc::new(&mut peripherals.LPWR);
#[cfg(not(any(esp32, esp32s2)))]
@ -755,5 +748,12 @@ pub fn init(config: Config) -> Peripherals {
crate::timer::timg::Wdt::<self::peripherals::TIMG1, Blocking>::set_wdt_enabled(false);
}
Clocks::init(config.cpu_clock);
#[cfg(xtensa)]
crate::interrupt::setup_interrupts();
#[cfg(esp32)]
crate::time::time_init();
peripherals
}