diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c
index 9d824b4e812..33ea1b7b28c 100644
--- a/drivers/timer/cavs_timer.c
+++ b/drivers/timer/cavs_timer.c
@@ -7,6 +7,7 @@
 #include <drivers/timer/system_timer.h>
 #include <sys_clock.h>
 #include <spinlock.h>
+#include <cavs-idc.h>
 
 /**
  * @file
@@ -195,9 +196,6 @@ void smp_timer_init(void)
 	 * FIXME: Done in this way because we don't have an API
 	 * to enable interrupts per CPU.
 	 */
-	sys_set_bit(DT_REG_ADDR(DT_NODELABEL(cavs0))
-			+ CAVS_ICTL_INT_CPU_OFFSET(arch_curr_cpu()->id)
-			+ 0x04,
-		    22 + TIMER);
+	CAVS_INTCTRL[arch_curr_cpu()->id].l2.clear = CAVS_L2_DWCT0;
 	irq_enable(TIMER_IRQ);
 }