alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-15 19:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/clk_tree_defs' into 'master'

Browse Source 
clk_tree: prework of introducing clock subsystem control

Closes IDF-4892

See merge request espressif/esp-idf!17631
This commit is contained in:
morris
2022-04-13 10:36:56 +08:00
parent 047903c612 cd83f4f307
commit cb5507f11c
61 changed files with 941 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/driver/deprecated/timer_legacy.c
View File

@@ -15,7 +15,7 @@
#include "hal/timer_ll.h"
#include "hal/check.h"
#include "soc/timer_periph.h"
#include "soc/rtc.h"
#include "esp_private/esp_clk.h"
#include "soc/timer_group_reg.h"
#include "esp_private/periph_ctrl.h"
@@ -78,11 +78,11 @@ esp_err_t timer_get_counter_time_sec(timer_group_t group_num, timer_idx_t timer_
uint32_t div = p_timer_obj[group_num][timer_num]->divider;
switch (p_timer_obj[group_num][timer_num]->clk_src) {
case GPTIMER_CLK_SRC_APB:
*time = (double)timer_val * div / rtc_clk_apb_freq_get();
*time = (double)timer_val * div / esp_clk_apb_freq();
break;
#if SOC_TIMER_GROUP_SUPPORT_XTAL
case GPTIMER_CLK_SRC_XTAL:
*time = (double)timer_val * div / ((int)rtc_clk_xtal_freq_get() * MHZ);
*time = (double)timer_val * div / esp_clk_xtal_freq();
break;
#endif
default: