diff --git a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi index 85cdb97e8457e..9c61122ee37c8 100644 --- a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi +++ b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi @@ -137,6 +137,10 @@ status = "okay"; }; +&wdt0 { + status = "okay"; +}; + zephyr_udc0: &usbd { status = "okay"; }; diff --git a/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml b/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml index 810ab165f06e7..74bad41789a7e 100644 --- a/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml +++ b/boards/raspberrypi/rpi_pico2/rpi_pico2_rp2350a_m33.yaml @@ -18,3 +18,4 @@ supported: - pwm - spi - uart + - watchdog diff --git a/drivers/clock_control/clock_control_rpi_pico.c b/drivers/clock_control/clock_control_rpi_pico.c index 02f2c867c31ed..762e72677ee6f 100644 --- a/drivers/clock_control/clock_control_rpi_pico.c +++ b/drivers/clock_control/clock_control_rpi_pico.c @@ -676,7 +676,7 @@ static int clock_control_rpi_pico_init(const struct device *dev) RESETS_RESET_USBCTRL_BITS)); /* Start tick in watchdog */ - watchdog_start_tick(cycles_per_tick); + tick_start(TICK_WATCHDOG, cycles_per_tick); #if defined(CONFIG_SOC_SERIES_RP2350) tick_start(TICK_TIMER0, cycles_per_tick); tick_start(TICK_TIMER1, cycles_per_tick); diff --git a/modules/hal_rpi_pico/CMakeLists.txt b/modules/hal_rpi_pico/CMakeLists.txt index 0a02aeae89299..046660a929a3d 100644 --- a/modules/hal_rpi_pico/CMakeLists.txt +++ b/modules/hal_rpi_pico/CMakeLists.txt @@ -61,7 +61,6 @@ if(CONFIG_HAS_RPI_PICO) ${rp2_common_dir}/hardware_clocks/clocks.c ${rp2_common_dir}/hardware_pll/pll.c ${rp2_common_dir}/hardware_xosc/xosc.c - ${rp2_common_dir}/hardware_watchdog/watchdog.c ${rp2_common_dir}/hardware_sync_spin_lock/sync_spin_lock.c ${rp2_common_dir}/hardware_ticks/ticks.c ${rp2_common_dir}/pico_bootrom/bootrom.c