Bladeren bron

soc, hal: remove XTAL_CLK_FREQ

XTAL_CLK_FREQ now depends on the actual XTAL used, remove this macro
and get the XTAL frequency from the RTC register instead.
No uses of XTAL_CLK_FREQ found, other than in the UART LL.
Ivan Grokhotkov 3 jaren geleden
bovenliggende
commit
2e37218ce5
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 1
      components/hal/esp32c2/include/hal/uart_ll.h
  2. 0 1
      components/soc/esp32c2/include/soc/soc.h

+ 2 - 1
components/hal/esp32c2/include/hal/uart_ll.h

@@ -11,6 +11,7 @@
 #pragma once
 #include "hal/uart_types.h"
 #include "soc/uart_periph.h"
+#include "hal/clk_tree_ll.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -157,7 +158,7 @@ static inline uint32_t uart_ll_get_sclk_freq(uart_dev_t *hw)
         case 2:
             return RTC_CLK_FREQ;
         case 3:
-            return XTAL_CLK_FREQ;
+            return clk_ll_xtal_load_freq_mhz() * MHZ;
     }
 }
 

+ 0 - 1
components/soc/esp32c2/include/soc/soc.h

@@ -148,7 +148,6 @@
 #define  APB_CLK_FREQ                                ( 40*1000000 )
 #define  REF_CLK_FREQ                                ( 1000000 )
 #define  RTC_CLK_FREQ                                (20*1000000)
-#define  XTAL_CLK_FREQ                               (40*1000000)
 #define  UART_CLK_FREQ                               APB_CLK_FREQ
 #define  WDT_CLK_FREQ                                APB_CLK_FREQ
 #define  TIMER_CLK_FREQ                              (80000000>>4) //80MHz divided by 4