From 6e8bff749c1b6c0bef243e77d44bad998fd2947b Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 28 Nov 2024 15:07:43 +0800 Subject: [PATCH] eliminate invalid PLL transition this transition was in the reference C code, but in verilog simulation it turns out it activates the PLL in an invalid mode which can lead to glitching. Removing this makes both the simulation happy and presumably the PLL happier as well. --- loader/src/platform/cramium/cramium.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index c1e915202..5b8f51a61 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -1415,14 +1415,6 @@ unsafe fn init_clock_asic(freq_hz: u32) -> u32 { crate::println!("pllq: 0x{:x}, pllmn: 0x{:x}, n_frac: 0x{:x}", pllq, pllmn, n_frac); - daric_cgu.add(sysctrl::SFR_CGUSEL1.offset()).write_volatile(1); // 0: RC, 1: XTAL - daric_cgu.add(sysctrl::SFR_CGUFSCR.offset()).write_volatile(48); // external crystal is 48MHz - daric_cgu.add(sysctrl::SFR_CGUSET.offset()).write_volatile(0x32); - - if freq_hz < 1_000_000 { - daric_cgu.add(sysctrl::SFR_IPCOSC.offset()).write_volatile(freq_hz); - daric_cgu.add(sysctrl::SFR_IPCARIPFLOW.offset()).write_volatile(0x32); // commit, must write 32 - } // switch to OSC daric_cgu.add(sysctrl::SFR_CGUSEL0.offset()).write_volatile(0); // clktop sel, 0:clksys, 1:clkpll0 daric_cgu.add(sysctrl::SFR_CGUSET.offset()).write_volatile(0x32); // commit