@@ -163,13 +163,13 @@ bool removeApbChangeCallback(void *arg, apb_change_cb_t cb) {
163
163
}
164
164
165
165
static uint32_t calculateApb (rtc_cpu_freq_config_t * conf ) {
166
- #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32P4
167
- return APB_CLK_FREQ ;
168
- #else
166
+ #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
169
167
if (conf -> freq_mhz >= 80 ) {
170
168
return 80 * MHZ ;
171
169
}
172
170
return (conf -> source_freq_mhz * MHZ ) / conf -> div ;
171
+ #else
172
+ return APB_CLK_FREQ ;
173
173
#endif
174
174
}
175
175
@@ -250,11 +250,8 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
250
250
}
251
251
#endif
252
252
//Update FreeRTOS Tick Divisor
253
- #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32P4
254
253
255
- #elif CONFIG_IDF_TARGET_ESP32S3
256
-
257
- #else
254
+ #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
258
255
uint32_t fcpu = (conf .freq_mhz >= 80 ) ? (conf .freq_mhz * MHZ ) : (apb );
259
256
_xt_tick_divisor = fcpu / XT_TICK_PER_SEC ;
260
257
#endif
@@ -265,13 +262,19 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
265
262
#ifdef SOC_CLK_APLL_SUPPORTED
266
263
log_d (
267
264
"%s: %u / %u = %u Mhz, APB: %u Hz" ,
268
- (conf .source == RTC_CPU_FREQ_SRC_PLL ) ? "PLL"
269
- : ((conf .source == RTC_CPU_FREQ_SRC_APLL ) ? "APLL" : ((conf .source == RTC_CPU_FREQ_SRC_XTAL ) ? "XTAL" : "8M" )),
265
+ (conf .source == SOC_CPU_CLK_SRC_PLL ) ? "PLL"
266
+ : ((conf .source == SOC_CPU_CLK_SRC_APLL ) ? "APLL"
267
+ : ((conf .source == SOC_CPU_CLK_SRC_XTAL ) ? "XTAL"
268
+ #ifdef CONFIG_IDF_TARGET_ESP32P4
269
+ : "17.5M" ),
270
+ #else
271
+ : "8M" )),
272
+ #endif
270
273
conf .source_freq_mhz , conf .div , conf .freq_mhz , apb
271
274
);
272
275
#else
273
276
log_d (
274
- "%s: %u / %u = %u Mhz, APB: %u Hz" , (conf .source == RTC_CPU_FREQ_SRC_PLL ) ? "PLL" : ((conf .source == RTC_CPU_FREQ_SRC_XTAL ) ? "XTAL" : "17.5M" ),
277
+ "%s: %u / %u = %u Mhz, APB: %u Hz" , (conf .source == SOC_CPU_CLK_SRC_PLL ) ? "PLL" : ((conf .source == SOC_CPU_CLK_SRC_XTAL ) ? "XTAL" : "17.5M" ),
275
278
conf .source_freq_mhz , conf .div , conf .freq_mhz , apb
276
279
);
277
280
#endif
0 commit comments