[fix] 适配TIMER驱动

Author: MuChenger

bsp/stm32/libraries/HAL_Drivers/drivers/config/n6/tim_config.h

@@ -27,38 +27,16 @@ extern "C" {
     }
 #endif /* TIM_DEV_INFO_CONFIG */
 
-#ifdef BSP_USING_TIM11
-#ifndef TIM11_CONFIG
-#define TIM11_CONFIG                                        \
+#ifdef BSP_USING_TIM2
+#ifndef TIM2_CONFIG
+#define TIM2_CONFIG                                        \
     {                                                       \
-       .tim_handle.Instance     = TIM11,                    \
-       .tim_irqn                = TIM1_TRG_COM_TIM11_IRQn,  \
-       .name                    = "timer11",                \
+       .tim_handle.Instance     = TIM2,                    \
+       .tim_irqn                = TIM2_IRQn,  \
+       .name                    = "timer2",                \
     }
-#endif /* TIM11_CONFIG */
-#endif /* BSP_USING_TIM11 */
-
-#ifdef BSP_USING_TIM13
-#ifndef TIM13_CONFIG
-#define TIM13_CONFIG                                        \
-    {                                                       \
-       .tim_handle.Instance     = TIM13,                    \
-       .tim_irqn                = TIM8_UP_TIM13_IRQn,       \
-       .name                    = "timer13",                \
-    }
-#endif /* TIM13_CONFIG */
-#endif /* BSP_USING_TIM13 */
-
-#ifdef BSP_USING_TIM14
-#ifndef TIM14_CONFIG
-#define TIM14_CONFIG                                        \
-    {                                                       \
-       .tim_handle.Instance     = TIM14,                    \
-       .tim_irqn                = TIM8_TRG_COM_TIM14_IRQn,  \
-       .name                    = "timer14",                \
-    }
-#endif /* TIM14_CONFIG */
-#endif /* BSP_USING_TIM14 */
+#endif /* TIM2_CONFIG */
+#endif /* BSP_USING_TIM2 */
 
 #ifdef __cplusplus
 }

bsp/stm32/libraries/HAL_Drivers/drivers/drv_tim.c

@@ -407,6 +407,9 @@ static void timer_init(struct rt_hwtimer_device *timer, rt_uint32_t state)
         {
             prescaler_value = (uint32_t)(HAL_RCC_GetPCLK1Freq() * pclk1_doubler / 10000) - 1;
         }
+#endif
+#if defined (SOC_SERIES_STM32N6)
+        prescaler_value = HAL_RCCEx_GetTIMGFreq() / 1000 /1000;
 #endif
         tim->Init.Period            = 10000 - 1;
         tim->Init.Prescaler         = prescaler_value;
@@ -420,7 +423,7 @@ static void timer_init(struct rt_hwtimer_device *timer, rt_uint32_t state)
             tim->Init.CounterMode   = TIM_COUNTERMODE_DOWN;
         }
         tim->Init.RepetitionCounter = 0;
-#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32WB)
+#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32N6)
         tim->Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
 #endif
         if (HAL_TIM_Base_Init(tim) != HAL_OK)
@@ -561,7 +564,7 @@ static rt_err_t timer_ctrl(rt_hwtimer_t *timer, rt_uint32_t cmd, void *arg)
         || tim->Instance == TIM17
 #endif /* TIM17 */
         )
-#elif defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32H7)
+#elif defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32N6)
         if (0)
 #else
 #error "This driver has not supported this series yet!"
@@ -573,7 +576,11 @@ static rt_err_t timer_ctrl(rt_hwtimer_t *timer, rt_uint32_t cmd, void *arg)
         }
         else
         {
-            val = HAL_RCC_GetPCLK1Freq() * pclk1_doubler / freq;
+#if defined(SOC_SERIES_STM32N6)
+					val = HAL_RCCEx_GetTIMGFreq() / freq);			
+#else
+					val = HAL_RCC_GetPCLK1Freq() * pclk1_doubler / freq;
+#endif					
         }
         __HAL_TIM_SET_PRESCALER(tim, val - 1);
 

bsp/stm32/stm32n657-st-nucleo-app/.config

@@ -276,7 +276,7 @@ CONFIG_RT_USING_SPI_ISR=y
 # CONFIG_RT_USING_VIRTIO is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_KTIME is not set
-# CONFIG_RT_USING_HWTIMER is not set
+CONFIG_RT_USING_HWTIMER=y
 # CONFIG_RT_USING_CHERRYUSB is not set
 # end of Device Drivers
 
@@ -1476,6 +1476,8 @@ CONFIG_BSP_USING_PWM1_CH1=y
 CONFIG_BSP_USING_PWM1_CH2=y
 CONFIG_BSP_USING_PWM1_CH3=y
 CONFIG_BSP_USING_PWM1_CH4=y
+CONFIG_BSP_USING_TIM=y
+CONFIG_BSP_USING_TIM2=y
 # CONFIG_BSP_USING_UDID is not set
 # end of On-chip Peripheral Drivers
 

bsp/stm32/stm32n657-st-nucleo-app/board/Kconfig

@@ -100,26 +100,17 @@ menu "On-chip Peripheral Drivers"
                     default n
             endif
          endif
-         
+
     menuconfig BSP_USING_TIM
         bool "Enable timer"
         default n
         select RT_USING_HWTIMER
         if BSP_USING_TIM
-            config BSP_USING_TIM11
-                bool "Enable TIM11"
-                default n
-
-            config BSP_USING_TIM13
-                bool "Enable TIM13"
-                default n
-
-            config BSP_USING_TIM14
-                bool "Enable TIM14"
+            config BSP_USING_TIM2
+                bool "Enable TIM2"
                 default n
         endif
 
-
     source "$(BSP_DIR)/../libraries/HAL_Drivers/drivers/Kconfig"
 
 endmenu