Merge pull request #3777 from adom-inc/rp2350-watchdog-fix

Dirbaio · web-flow · commit 1d8ef6faa2cf · 2025-01-21T23:08:01.000Z
fix: enable RP2350 watchdog tick generator
diff --git a/embassy-rp/src/clocks.rs b/embassy-rp/src/clocks.rs
@@ -524,8 +524,13 @@ pub(crate) unsafe fn init(config: ClockConfig) {
     // Configure tick generator on the 2350
     #[cfg(feature = "_rp235x")]
     {
-        pac::TICKS.timer0_cycles().write(|w| w.0 = clk_ref_freq / 1_000_000);
+        let cycle_count = clk_ref_freq / 1_000_000;
+
+        pac::TICKS.timer0_cycles().write(|w| w.0 = cycle_count);
         pac::TICKS.timer0_ctrl().write(|w| w.set_enable(true));
+
+        pac::TICKS.watchdog_cycles().write(|w| w.0 = cycle_count);
+        pac::TICKS.watchdog_ctrl().write(|w| w.set_enable(true));
     }
 
     let (sys_src, sys_aux, clk_sys_freq) = {

Original file line number	Diff line number	Diff line change
`@@ -524,8 +524,13 @@ pub(crate) unsafe fn init(config: ClockConfig) {`
`524`	`524`	`// Configure tick generator on the 2350`
`525`	`525`	`#[cfg(feature = "_rp235x")]`
`526`	`526`	`{`
`527`		`- pac::TICKS.timer0_cycles().write(\|w\| w.0 = clk_ref_freq / 1_000_000);`
	`527`	`+ let cycle_count = clk_ref_freq / 1_000_000;`
	`528`	`+`
	`529`	`+ pac::TICKS.timer0_cycles().write(\|w\| w.0 = cycle_count);`
`528`	`530`	`pac::TICKS.timer0_ctrl().write(\|w\| w.set_enable(true));`
	`531`	`+`
	`532`	`+ pac::TICKS.watchdog_cycles().write(\|w\| w.0 = cycle_count);`
	`533`	`+ pac::TICKS.watchdog_ctrl().write(\|w\| w.set_enable(true));`
`529`	`534`	`}`
`530`	`535`
`531`	`536`	`let (sys_src, sys_aux, clk_sys_freq) = {`