From 7a04649d15a93147d84ced882ecaa085b99412f8 Mon Sep 17 00:00:00 2001
From: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
Date: Fri, 27 Oct 2023 17:46:53 +0100
Subject: [PATCH] drivers: counter: Update NXP LPC RTC timer

1. Issue a reset during init to ensure the registers
are in their reset state.
2. The value in counter_set_top_value was not written
to the register. This function now returns -ENOTSUP
3. Make sure the RTC is enabled before we issue RTC_Start
command.
4. Replace calls to SDK API's RTC_StartTimer and
RTC_StopTimer with RTC_EnableTimer

Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
---
 drivers/counter/counter_mcux_lpc_rtc.c | 41 +++++++-------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/drivers/counter/counter_mcux_lpc_rtc.c b/drivers/counter/counter_mcux_lpc_rtc.c
index 18cafe1272d..2bb8d920fea 100644
--- a/drivers/counter/counter_mcux_lpc_rtc.c
+++ b/drivers/counter/counter_mcux_lpc_rtc.c
@@ -16,9 +16,7 @@ LOG_MODULE_REGISTER(mcux_rtc, CONFIG_COUNTER_LOG_LEVEL);
 
 struct mcux_lpc_rtc_data {
 	counter_alarm_callback_t alarm_callback;
-	counter_top_callback_t top_callback;
 	void *alarm_user_data;
-	void *top_user_data;
 };
 
 struct mcux_lpc_rtc_config {
@@ -35,7 +33,7 @@ static int mcux_lpc_rtc_start(const struct device *dev)
 	const struct mcux_lpc_rtc_config *config =
 		CONTAINER_OF(info, struct mcux_lpc_rtc_config, info);
 
-	RTC_StartTimer(config->base);
+	RTC_EnableTimer(config->base, true);
 
 	return 0;
 }
@@ -46,7 +44,7 @@ static int mcux_lpc_rtc_stop(const struct device *dev)
 	const struct mcux_lpc_rtc_config *config =
 		CONTAINER_OF(info, struct mcux_lpc_rtc_config, info);
 
-	RTC_StopTimer(config->base);
+	RTC_EnableTimer(config->base, false);
 
 	/* clear out any set alarms */
 	RTC_SetSecondsTimerMatch(config->base, 0);
@@ -128,26 +126,7 @@ static int mcux_lpc_rtc_cancel_alarm(const struct device *dev, uint8_t chan_id)
 static int mcux_lpc_rtc_set_top_value(const struct device *dev,
 				  const struct counter_top_cfg *cfg)
 {
-	const struct counter_config_info *info = dev->config;
-	const struct mcux_lpc_rtc_config *config =
-			CONTAINER_OF(info, struct mcux_lpc_rtc_config, info);
-	struct mcux_lpc_rtc_data *data = dev->data;
-
-	if (cfg->ticks != info->max_top_value) {
-		LOG_ERR("Wrap can only be set to 0x%x.", info->max_top_value);
-		return -ENOTSUP;
-	}
-
-	if (!(cfg->flags & COUNTER_TOP_CFG_DONT_RESET)) {
-		RTC_StopTimer(config->base);
-		RTC_SetSecondsTimerCount(config->base, 0);
-		RTC_StartTimer(config->base);
-	}
-
-	data->top_callback = cfg->callback;
-	data->top_user_data = cfg->user_data;
-
-	return 0;
+	return -ENOTSUP;
 }
 
 static uint32_t mcux_lpc_rtc_get_pending_int(const struct device *dev)
@@ -174,6 +153,7 @@ static void mcux_lpc_rtc_isr(const struct device *dev)
 	struct mcux_lpc_rtc_data *data = dev->data;
 	counter_alarm_callback_t cb;
 	uint32_t current = mcux_lpc_rtc_read(dev);
+	uint32_t enable = (config->base->CTRL & RTC_CTRL_RTC_EN_MASK);
 
 
 	LOG_DBG("Current time is %d ticks", current);
@@ -185,21 +165,19 @@ static void mcux_lpc_rtc_isr(const struct device *dev)
 		cb(dev, 0, current, data->alarm_user_data);
 	}
 
-	if (data->top_callback) {
-		data->top_callback(dev, data->top_user_data);
-	}
-
 	/*
 	 * Clear any conditions to ack the IRQ
 	 *
 	 * callback may have already reset the alarm flag if a new
 	 * alarm value was programmed to the TAR
 	 */
-	RTC_StopTimer(config->base);
+	RTC_EnableTimer(config->base, false);
 	if (RTC_GetStatusFlags(config->base) & RTC_CTRL_ALARM1HZ_MASK) {
 		RTC_ClearStatusFlags(config->base, kRTC_AlarmFlag);
 	}
-	RTC_StartTimer(config->base);
+	if (enable) {
+		RTC_EnableTimer(config->base, true);
+	}
 }
 
 static int mcux_lpc_rtc_init(const struct device *dev)
@@ -210,6 +188,9 @@ static int mcux_lpc_rtc_init(const struct device *dev)
 
 	RTC_Init(config->base);
 
+	/* Issue a software reset to set the registers to init state */
+	RTC_Reset(config->base);
+
 	config->irq_config_func(dev);
 
 	if (config->wakeup_source) {