drivers: nrf: Adjust clock_control and timer drivers for nRF9160

Minor adjustments are done to the nRF clock_control and rtc_timer
drivers to make them usable on nRF9160 as well.
The arm_irq_vector_table test code is modified only because it uses
the function that has been renamed in the nrf_rtc_timer driver.

Signed-off-by: Andrzej Głąbek <[email protected]>

Author: anangl

drivers/clock_control/nrf_power_clock.c

@@ -11,7 +11,7 @@
 #include <device.h>
 #include <clock_control.h>
 #include <misc/__assert.h>
-#include "nrf_clock.h"
+#include <nrf_clock.h>
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 #include <nrf_power.h>
 #include <drivers/clock_control/nrf_clock_control.h>
@@ -95,7 +95,7 @@ static int _m16src_start(struct device *dev, clock_control_subsys_t sub_system)
 	 */
 	__ASSERT_NO_MSG(m16src_ref);
 
-	stat = CLOCK_HFCLKSTAT_SRC_Xtal | CLOCK_HFCLKSTAT_STATE_Msk;
+	stat = NRF_CLOCK_HFCLK_HIGH_ACCURACY | CLOCK_HFCLKSTAT_STATE_Msk;
 	if ((NRF_CLOCK->HFCLKSTAT & stat) == stat) {
 		return 0;
 	} else {
@@ -216,6 +216,7 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
 	nrf_clock_task_trigger(NRF_CLOCK_TASK_LFCLKSTART);
 #endif /* !CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING */
 
+#if NRF_CLOCK_HAS_CALIBRATION
 	/* If RC selected, calibrate and start timer for consecutive
 	 * calibrations.
 	 */
@@ -254,6 +255,7 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
 			__ASSERT_NO_MSG(err == -EINPROGRESS);
 		}
 	}
+#endif /* NRF_CLOCK_HAS_CALIBRATION */
 
 lf_already_started:
 	stat = (NRF_CLOCK->LFCLKSRCCOPY & CLOCK_LFCLKSRCCOPY_SRC_Msk) |
@@ -276,11 +278,14 @@ static inline void power_event_cb(nrf_power_event_t event)
 
 static void _power_clock_isr(void *arg)
 {
-	u8_t pof, hf_intenset, hf, lf_intenset, lf, done, ctto;
+	u8_t pof, hf_intenset, hf, lf_intenset, lf;
+#if NRF_CLOCK_HAS_CALIBRATION
+	u8_t ctto, done;
+	struct device *dev = arg;
+#endif
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 	bool usb_detected, usb_pwr_rdy, usb_removed;
 #endif
-	struct device *dev = arg;
 
 	pof = (NRF_POWER->EVENTS_POFWARN != 0);
 
@@ -292,19 +297,24 @@ static void _power_clock_isr(void *arg)
 		       CLOCK_INTENSET_LFCLKSTARTED_Msk) != 0);
 	lf = (NRF_CLOCK->EVENTS_LFCLKSTARTED != 0);
 
+#if NRF_CLOCK_HAS_CALIBRATION
 	done = (NRF_CLOCK->EVENTS_DONE != 0);
 	ctto = (NRF_CLOCK->EVENTS_CTTO != 0);
-
+#endif
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 	usb_detected = nrf_power_event_check(NRF_POWER_EVENT_USBDETECTED);
 	usb_pwr_rdy = nrf_power_event_check(NRF_POWER_EVENT_USBPWRRDY);
 	usb_removed = nrf_power_event_check(NRF_POWER_EVENT_USBREMOVED);
+#endif
 
-	__ASSERT_NO_MSG(pof || hf || hf_intenset || lf || done || ctto ||
-			usb_detected || usb_pwr_rdy || usb_removed);
-#else
-	__ASSERT_NO_MSG(pof || hf || hf_intenset || lf || done || ctto);
+	__ASSERT_NO_MSG(pof || hf || hf_intenset || lf
+#if NRF_CLOCK_HAS_CALIBRATION
+			|| done || ctto
+#endif
+#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
+			|| usb_detected || usb_pwr_rdy || usb_removed
 #endif
+	);
 
 	if (pof) {
 		NRF_POWER->EVENTS_POFWARN = 0;
@@ -332,8 +342,10 @@ static void _power_clock_isr(void *arg)
 		*(volatile u32_t *)0x40000C34 = 0x00000002;
 #endif /* CONFIG_SOC_SERIES_NRF52X */
 
+#if NRF_CLOCK_HAS_CALIBRATION
 		/* Start Calibration */
 		NRF_CLOCK->TASKS_CAL = 1;
+#endif
 	}
 
 	if (lf) {
@@ -345,14 +357,17 @@ static void _power_clock_isr(void *arg)
 			 */
 			NRF_CLOCK->INTENCLR = CLOCK_INTENCLR_LFCLKSTARTED_Msk;
 
+#if NRF_CLOCK_HAS_CALIBRATION
 			/* Start HF Clock if LF RC is used. */
 			if ((NRF_CLOCK->LFCLKSRCCOPY & CLOCK_LFCLKSRCCOPY_SRC_Msk) ==
 			    CLOCK_LFCLKSRCCOPY_SRC_RC) {
 				ctto = 1U;
 			}
+#endif
 		}
 	}
 
+#if NRF_CLOCK_HAS_CALIBRATION
 	if (done) {
 		int err;
 
@@ -392,6 +407,7 @@ static void _power_clock_isr(void *arg)
 			__ASSERT_NO_MSG(err == -EINPROGRESS);
 		}
 	}
+#endif /* NRF_CLOCK_HAS_CALIBRATION */
 
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 	if (usb_detected) {

drivers/timer/nrf_rtc_timer.c

@@ -49,7 +49,7 @@ static u32_t counter(void)
  * it by pointer at runtime, maybe?) so we don't have this leaky
  * symbol.
  */
-void rtc1_nrf5_isr(void *arg)
+void rtc1_nrf_isr(void *arg)
 {
 	ARG_UNUSED(arg);
 	RTC->EVENTS_COMPARE[0] = 0;
@@ -94,10 +94,10 @@ int z_clock_driver_init(struct device *device)
 
 	/* Clear the event flag and possible pending interrupt */
 	nrf_rtc_event_clear(RTC, NRF_RTC_EVENT_COMPARE_0);
-	NVIC_ClearPendingIRQ(NRF5_IRQ_RTC1_IRQn);
+	NVIC_ClearPendingIRQ(RTC1_IRQn);
 
-	IRQ_CONNECT(NRF5_IRQ_RTC1_IRQn, 1, rtc1_nrf5_isr, 0, 0);
-	irq_enable(NRF5_IRQ_RTC1_IRQn);
+	IRQ_CONNECT(RTC1_IRQn, 1, rtc1_nrf_isr, 0, 0);
+	irq_enable(RTC1_IRQn);
 
 	nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_CLEAR);
 	nrf_rtc_task_trigger(RTC, NRF_RTC_TASK_START);

tests/kernel/arm_irq_vector_table/src/arm_irq_vector_table.c

@@ -120,12 +120,12 @@ void test_arm_irq_vector_table(void)
  * SysTick. Therefore, a pointer to the timer ISR needs to be added in
  * the custom vector table to handle the timer "tick" interrupts.
  */
-void rtc1_nrf5_isr(void);
+void rtc1_nrf_isr(void);
 typedef void (*vth)(void); /* Vector Table Handler */
 vth __irq_vector_table _irq_vector_table[RTC1_IRQn + 1] = {
 	isr0, isr1, isr2,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	rtc1_nrf5_isr
+	rtc1_nrf_isr
 };
 #else
 typedef void (*vth)(void); /* Vector Table Handler */