clock: Add support for DPPI to CLOCK

Add use of DPPI to CLOCK if DPPI is defined.

Signed-off-by: Sletnes Bjørlo, Aurora <[email protected]>

Author: auroraslb

src/HW_models/NRF_CLOCK.c

@@ -8,7 +8,11 @@
 #include <stdint.h>
 #include "time_machine_if.h"
 #include "NRF_HW_model_top.h"
+#if defined(PPI_PRESENT)
 #include "NRF_PPI.h"
+#elif defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 #include "NRF_RTC.h"
 #include "irq_ctrl.h"
 #include "irq_sources.h"
@@ -141,7 +145,17 @@ void nrf_clock_LFTimer_triggered(){
                           | (NRF_CLOCK_regs.LFCLKSRCCOPY << CLOCK_LFCLKSTAT_SRC_Pos);
 
     NRF_CLOCK_regs.EVENTS_LFCLKSTARTED = 1;
+
+#if defined(PPI_PRESENT)
     nrf_ppi_event(CLOCK_EVENTS_LFCLKSTARTED);
+#elif defined(DPPI_PRESENT)
+    if (NRF_CLOCK_regs.PUBLISH_LFCLKSTARTED & CLOCK_PUBLISH_LFCLKSTARTED_EN_Msk)
+      {
+        uint8_t channel  = NRF_CLOCK_regs.PUBLISH_LFCLKSTARTED & CLOCK_PUBLISH_LFCLKSTARTED_CHIDX_Msk;
+        nrf_dppi_publish(channel);
+      }
+#endif
+
     if ( CLOCK_INTEN & CLOCK_INTENSET_LFCLKSTARTED_Msk ){
       hw_irq_ctrl_set_irq(NRF5_IRQ_POWER_CLOCK_IRQn);
     }
@@ -157,11 +171,26 @@ void nrf_clock_HFTimer_triggered(){
   if ( HF_Clock_state == Starting ){
     HF_Clock_state = Started;
 
+#if !defined(NRF53_SERIES)
     NRF_CLOCK_regs.HFCLKSTAT = CLOCK_HFCLKSTAT_STATE_Msk
                                | ( CLOCK_HFCLKSTAT_SRC_Xtal << CLOCK_HFCLKSTAT_SRC_Pos);
+#else
+    NRF_CLOCK_regs.HFCLKSTAT = CLOCK_HFCLKSTAT_STATE_Msk
+                               | ( CLOCK_HFCLKSTAT_SRC_HFXO << CLOCK_HFCLKSTAT_SRC_Pos);
+#endif
 
     NRF_CLOCK_regs.EVENTS_HFCLKSTARTED = 1;
+
+#if defined(PPI_PRESENT)
     nrf_ppi_event(CLOCK_EVENTS_HFCLKSTARTED);
+#elif defined(DPPI_PRESENT)
+    if (NRF_CLOCK_regs.PUBLISH_HFCLKSTARTED & CLOCK_PUBLISH_HFCLKSTARTED_EN_Msk)
+      {
+        uint8_t channel  = NRF_CLOCK_regs.PUBLISH_HFCLKSTARTED & CLOCK_PUBLISH_HFCLKSTARTED_CHIDX_Msk;
+        nrf_dppi_publish(channel);
+      }
+#endif
+
     if ( CLOCK_INTEN & CLOCK_INTENSET_HFCLKSTARTED_Msk ){
       hw_irq_ctrl_set_irq(NRF5_IRQ_POWER_CLOCK_IRQn);
     }

src/HW_models/NRF_CLOCK.h

@@ -19,6 +19,7 @@ void nrf_clock_LFTimer_triggered();
 void nrf_clock_HFTimer_triggered();
 void nrf_clock_TASKS_LFCLKSTART();
 void nrf_clock_TASKS_HFCLKSTART();
+void nrf_clock_TASKS_HFCLKSTOP();
 void nrf_clock_reqw_sideeffects_INTENSET();
 void nrf_clock_reqw_sideeffects_INTENCLR();
 void nrf_clock_reqw_sideeffects_TASKS_LFCLKSTART();

src/nrfx/hal/nrf_clock.c

@@ -8,6 +8,9 @@
 #include "hal/nrf_clock.h"
 #include "bs_tracing.h"
 #include "NRF_CLOCK.h"
+#if defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 
 void nrf_clock_int_enable(NRF_CLOCK_Type * p_reg, uint32_t mask)
 {
@@ -46,3 +49,62 @@ void nrf_clock_task_trigger(NRF_CLOCK_Type * p_reg, nrf_clock_task_t task)
     bs_trace_warning_line_time("Not supported task started in nrf_clock, %d\n", task);
   }
 }
+
+
+#if defined(DPPI_PRESENT)
+void nrf_clock_subscriber_add(nrf_clock_task_t task, uint8_t channel)
+{
+  switch(task) {
+    case NRF_CLOCK_TASK_HFCLKSTART:
+      nrf_dppi_subscriber_add(channel, nrf_clock_TASKS_HFCLKSTART);
+      break;
+    case NRF_CLOCK_TASK_HFCLKSTOP:
+      nrf_dppi_subscriber_add(channel, nrf_clock_TASKS_HFCLKSTOP);
+      break;
+    case NRF_CLOCK_TASK_LFCLKSTART:
+      nrf_dppi_subscriber_add(channel, nrf_clock_TASKS_LFCLKSTART);
+      break;
+    default:
+      bs_trace_warning_line_time(
+        "NRF_CLOCK: The task %p for chnbr %i does not match any modelled task in NRF_DPPI.c => it will be ignored\n",
+        task, channel);
+      break;
+  }
+}
+
+void nrf_clock_subscriber_remove(nrf_clock_task_t task)
+{
+  switch(task) {
+    case NRF_CLOCK_TASK_HFCLKSTART:
+      nrf_dppi_subscriber_remove(nrf_clock_TASKS_HFCLKSTART);
+      break;
+    case NRF_CLOCK_TASK_HFCLKSTOP:
+      nrf_dppi_subscriber_remove(nrf_clock_TASKS_HFCLKSTOP);
+      break;
+    case NRF_CLOCK_TASK_LFCLKSTART:
+      nrf_dppi_subscriber_remove(nrf_clock_TASKS_LFCLKSTART);
+      break;
+    default:
+      bs_trace_warning_line_time(
+        "NRF_CLOCK: The task %p does not match any modelled task in NRF_DPPI.c => it will be ignored\n",
+        task);
+      break;
+  }
+}
+
+void nrf_clock_subscribe_set(NRF_CLOCK_Type * p_reg,
+                             nrf_clock_task_t task,
+                             uint8_t          channel)
+{
+  *((volatile uint32_t *) ((uint8_t *)p_reg+ (uint32_t)task + 0x80uL)) =
+          ((uint32_t)channel | CLOCK_SUBSCRIBE_HFCLKSTART_EN_Msk);
+  nrf_clock_subscriber_add(task, channel);
+}
+
+void nrf_clock_subscribe_clear(NRF_CLOCK_Type * p_reg, nrf_clock_task_t task)
+{
+  *((volatile uint32_t *) ((uint8_t *)p_reg + (uint32_t)task + 0x80uL)) = 0;
+  nrf_clock_subscriber_remove(task);
+}
+
+#endif // defined(DPPI_PRESENT)