Skip to content

wire clk_sys to pll_sys, don't set refdiv (Fixes #5) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kahara wants to merge 1 commit into
base: main
Choose a base branch
from
Open

wire clk_sys to pll_sys, don't set refdiv (Fixes #5) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion memory.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ SECTIONS {
{
KEEP(*(.boot2));
} > BOOT2
} INSERT BEFORE .text;
} INSERT BEFORE .text;
10 changes: 8 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ fn init(

pll::PLL::new(pll_sys).configure(1, 1500_000_000, 6, 2);
pll::PLL::new(pll_usb).configure(1, 480_000_000, 5, 2);

// Switch clk_sys to pll_sys
clocks.clk_sys_ctrl.modify(|_, w| w.auxsrc().clksrc_pll_sys() );
clocks.clk_sys_ctrl.modify(|_, w| w.src().clksrc_clk_sys_aux() );
while clocks.clk_sys_selected.read().bits() != 2 {}
}

#[entry]
Expand All @@ -95,6 +100,7 @@ fn main() -> ! {
init(p.RESETS, p.WATCHDOG, p.CLOCKS, p.XOSC, p.PLL_SYS, p.PLL_USB);

let led_pin = 25;
let half_cycle = 125000000/2;

loop {
info!("on!");
Expand All @@ -104,7 +110,7 @@ fn main() -> ! {
w
});

cortex_m::asm::delay(1_000_000);
cortex_m::asm::delay(half_cycle);

info!("off!");
p.IO_BANK0.gpio[led_pin].gpio_ctrl.write(|w| {
Expand All @@ -113,6 +119,6 @@ fn main() -> ! {
w
});

cortex_m::asm::delay(1_000_000);
cortex_m::asm::delay(half_cycle);
}
}
6 changes: 2 additions & 4 deletions src/pll.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ impl<T: Instance> PLL<T> {

pub fn configure(&mut self, refdiv: u32, vco_freq: u32, post_div1: u8, post_div2: u8) {
let p = &self.inner;
let ref_mhz = XOSC_MHZ / refdiv;
let fbdiv = vco_freq / (ref_mhz * 1_000_000);

// Power off in case it's already running
p.pwr.reset();
p.fbdiv_int.reset();

let ref_mhz = XOSC_MHZ / refdiv;
p.cs.write(|w| unsafe { w.bits(ref_mhz as _) });

let fbdiv = vco_freq / (ref_mhz * 1_000_000);
assert!(fbdiv >= 16 && fbdiv <= 520);
assert!((post_div1 >= 1 && post_div1 <= 7) && (post_div2 >= 1 && post_div2 <= 7));
assert!(post_div2 <= post_div1);
Expand Down