drivers: counter: stm32: remove init struct

Remove the calls to LL_TIM_StructInit and LL_TIM_Init in the counter
driver. This avoids calling functions from stm32xxxx_ll_tim.c.
They are replaced by a set of simpler functions from the header file.

Also replaces some macros that used constants coming from the HAL. Use
an equivalent coming purely from the LL.

Signed-off-by: Guillaume Gautier <[email protected]>

Author: gautierg-st

drivers/counter/counter_ll_stm32_timer.c

@@ -27,12 +27,12 @@ LOG_MODULE_REGISTER(counter_timer_stm32, CONFIG_COUNTER_LOG_LEVEL);
 #define TIMER_MAX_CH 4U
 
 /** Number of channels for timer by index. */
-#define NUM_CH(timx)					    \
-	(IS_TIM_CCX_INSTANCE(timx, TIM_CHANNEL_4) ? 4U :    \
-	 (IS_TIM_CCX_INSTANCE(timx, TIM_CHANNEL_3) ? 3U :   \
-	  (IS_TIM_CCX_INSTANCE(timx, TIM_CHANNEL_2) ? 2U :  \
-	   (IS_TIM_CCX_INSTANCE(timx, TIM_CHANNEL_1) ? 1U : \
-	    0))))
+#define NUM_CH(timx)				\
+	(IS_TIM_CC4_INSTANCE(timx) ? 4U :	\
+	 (IS_TIM_CC3_INSTANCE(timx) ? 3U :	\
+	  (IS_TIM_CC2_INSTANCE(timx) ? 2U :	\
+	   (IS_TIM_CC1_INSTANCE(timx) ? 1U :	\
+	    0U))))
 
 /** Channel to compare set function mapping. */
 static void(*const set_timer_compare[TIMER_MAX_CH])(TIM_TypeDef *,
@@ -369,7 +369,6 @@ static int counter_stm32_init_timer(const struct device *dev)
 	const struct counter_stm32_config *cfg = dev->config;
 	struct counter_stm32_data *data = dev->data;
 	TIM_TypeDef *timer = cfg->timer;
-	LL_TIM_InitTypeDef init;
 	const struct device *clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 	uint32_t tim_clk;
 	int r;
@@ -413,17 +412,27 @@ static int counter_stm32_init_timer(const struct device *dev)
 	cfg->irq_config_func(dev);
 
 	/* initialize timer */
-	LL_TIM_StructInit(&init);
+	LL_TIM_SetPrescaler(timer, cfg->prescaler);
+	LL_TIM_SetAutoReload(timer, counter_get_max_top_value(dev));
 
-	init.Prescaler = cfg->prescaler;
-	init.CounterMode = LL_TIM_COUNTERMODE_UP;
-	init.Autoreload = counter_get_max_top_value(dev);
-	init.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
+	if (IS_TIM_COUNTER_MODE_SELECT_INSTANCE(timer)) {
+		LL_TIM_SetCounterMode(timer, LL_TIM_COUNTERMODE_UP);
+	}
+
+	if (IS_TIM_CLOCK_DIVISION_INSTANCE(timer)) {
+		LL_TIM_SetClockDivision(timer, LL_TIM_CLOCKDIVISION_DIV1);
+	}
 
-	if (LL_TIM_Init(timer, &init) != SUCCESS) {
-		LOG_ERR("Could not initialize timer");
-		return -EIO;
+#ifdef IS_TIM_REPETITION_COUNTER_INSTANCE
+	if (IS_TIM_REPETITION_COUNTER_INSTANCE(timer)) {
+		LL_TIM_SetRepetitionCounter(timer, 0U);
 	}
+#endif
+
+	/* Generate an update event to reload the Prescaler
+	 * and the repetition counter value (if applicable) immediately
+	 */
+	LL_TIM_GenerateEvent_UPDATE(timer);
 
 	return 0;
 }