From b700e4b0adb401ece7b21387db3a9172bef11ea7 Mon Sep 17 00:00:00 2001
From: Matt Mets <matt@blinkinlabs.com>
Date: Mon, 6 Jan 2025 11:46:19 +0100
Subject: [PATCH] Remove redundant ticks initialization

---
 src/machine/machine_rp2_2040.go   |  2 --
 src/machine/machine_rp2_2350.go   | 10 ++++------
 src/machine/machine_rp2_clocks.go |  2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/machine/machine_rp2_2040.go b/src/machine/machine_rp2_2040.go
index 158c77a61f..82d508be28 100644
--- a/src/machine/machine_rp2_2040.go
+++ b/src/machine/machine_rp2_2040.go
@@ -201,8 +201,6 @@ func (clks *clocksType) initRTC() {
 		46875)
 }
 
-func (clks *clocksType) initTicks() {} // No ticks on RP2040
-
 // startTick starts the watchdog tick.
 // cycles needs to be a divider that when applied to the xosc input,
 // produces a 1MHz clock. So if the xosc frequency is 12MHz,
diff --git a/src/machine/machine_rp2_2350.go b/src/machine/machine_rp2_2350.go
index 190d1f3284..802a502279 100644
--- a/src/machine/machine_rp2_2350.go
+++ b/src/machine/machine_rp2_2350.go
@@ -213,12 +213,6 @@ func irqSet(num uint32, enabled bool) {
 
 func (clks *clocksType) initRTC() {} // No RTC on RP2350.
 
-func (clks *clocksType) initTicks() {
-	rp.TICKS.SetTIMER0_CTRL_ENABLE(0)
-	rp.TICKS.SetTIMER0_CYCLES(12)
-	rp.TICKS.SetTIMER0_CTRL_ENABLE(1)
-}
-
 func EnterBootloader() {
 	enterBootloader()
 }
@@ -227,5 +221,9 @@ func EnterBootloader() {
 // On RP2040, the watchdog contained a tick generator used to generate a 1μs tick for the watchdog. This was also
 // distributed to the system timer. On RP2350, the watchdog instead takes a tick input from the system-level ticks block. See Section 8.5.
 func (wd *watchdogImpl) startTick(cycles uint32) {
+	rp.TICKS.SetTIMER0_CTRL_ENABLE(0)
+	rp.TICKS.SetTIMER0_CYCLES(cycles)
+	rp.TICKS.SetTIMER0_CTRL_ENABLE(1)
+
 	rp.TICKS.WATCHDOG_CTRL.SetBits(1)
 }
diff --git a/src/machine/machine_rp2_clocks.go b/src/machine/machine_rp2_clocks.go
index b4ef0dcee8..9ae77d1be9 100644
--- a/src/machine/machine_rp2_clocks.go
+++ b/src/machine/machine_rp2_clocks.go
@@ -211,6 +211,4 @@ func (clks *clocksType) init() {
 		rp.CLOCKS_CLK_PERI_CTRL_AUXSRC_CLK_SYS,
 		pllSysFreq,
 		pllSysFreq)
-
-	clks.initTicks()
 }