From 0f79056ac74b8ba2768639e13cbc6295b9005ac1 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 6 May 2024 03:32:41 +0800 Subject: [PATCH] refactor spim divider equation to reflect reality --- libs/cramium-hal/src/udma.rs | 4 ++-- loader/src/platform/cramium/cramium.rs | 4 ++-- loader/src/platform/cramium/swap.rs | 4 ++-- services/xous-swapper/src/platform/cramium/hw.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/cramium-hal/src/udma.rs b/libs/cramium-hal/src/udma.rs index 13c23c6ec..2a0e86e75 100644 --- a/libs/cramium-hal/src/udma.rs +++ b/libs/cramium-hal/src/udma.rs @@ -819,7 +819,7 @@ impl Spim { .expect("couldn't map serial port"); let csr = CSR::new(csr_range.as_mut_ptr() as *mut u32); - let clk_div = sys_clk_freq / spi_clk_freq; + let clk_div = sys_clk_freq / (2 * spi_clk_freq); // make this a hard panic -- you'll find out at runtime that you f'd up // but at least you find out. assert!(clk_div < 256, "SPI clock divider is out of range"); @@ -902,7 +902,7 @@ impl Spim { #[cfg(not(target_os = "xous"))] let csr = CSR::new(base_addr as *mut u32); - let clk_div = sys_clk_freq / spi_clk_freq; + let clk_div = sys_clk_freq / (2 * spi_clk_freq); // make this a hard panic -- you'll find out at runtime that you f'd up // but at least you find out. assert!(clk_div < 256, "SPI clock divider is out of range"); diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index ec8a4e99b..68bfb3b19 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -426,7 +426,7 @@ pub fn early_init() { let mut flash_spim = unsafe { Spim::new_with_ifram( channel, - 50_000_000, + 25_000_000, 50_000_000, SpimClkPol::LeadingEdgeRise, SpimClkPha::CaptureOnLeading, @@ -445,7 +445,7 @@ pub fn early_init() { let mut ram_spim = unsafe { Spim::new_with_ifram( channel, - 50_000_000, + 25_000_000, 50_000_000, SpimClkPol::LeadingEdgeRise, SpimClkPha::CaptureOnLeading, diff --git a/loader/src/platform/cramium/swap.rs b/loader/src/platform/cramium/swap.rs index 335d4866a..93b08668b 100644 --- a/loader/src/platform/cramium/swap.rs +++ b/loader/src/platform/cramium/swap.rs @@ -191,7 +191,7 @@ impl SwapHal { let mut flash_spim = unsafe { Spim::new_with_ifram( channel, - 50_000_000, + 25_000_000, 50_000_000, SpimClkPol::LeadingEdgeRise, SpimClkPha::CaptureOnLeading, @@ -210,7 +210,7 @@ impl SwapHal { let mut ram_spim = unsafe { Spim::new_with_ifram( channel, - 50_000_000, + 25_000_000, 50_000_000, SpimClkPol::LeadingEdgeRise, SpimClkPha::CaptureOnLeading, diff --git a/services/xous-swapper/src/platform/cramium/hw.rs b/services/xous-swapper/src/platform/cramium/hw.rs index 513649a5f..b94e622ec 100644 --- a/services/xous-swapper/src/platform/cramium/hw.rs +++ b/services/xous-swapper/src/platform/cramium/hw.rs @@ -41,7 +41,7 @@ impl SwapHal { ram_spim: unsafe { Spim::new_with_ifram( channel, - 50_000_000, + 25_000_000, 50_000_000, SpimClkPol::LeadingEdgeRise, SpimClkPha::CaptureOnLeading,