Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit eb72580

Browse filesBrowse files
authored
Merge pull request espressif#10735 from lucasssvaz/fix/p4_apll
fix(clk_src): Fix error as APLL is not yet supported for P4
2 parents 30e55fc + c688f30 commit eb72580
Copy full SHA for eb72580

File tree

Expand file treeCollapse file tree

1 file changed

+2
-11
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-11
lines changed

‎cores/esp32/esp32-hal-cpu.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-cpu.c
+2-11Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -259,18 +259,10 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
259259
if (apb_change_callbacks) {
260260
triggerApbChangeCallback(APB_AFTER_CHANGE, capb, apb);
261261
}
262-
// clang-format off
263-
#ifdef SOC_CLK_APLL_SUPPORTED
262+
#if defined(SOC_CLK_APLL_SUPPORTED) && !defined(CONFIG_IDF_TARGET_ESP32P4) // APLL not yet supported in ESP32-P4
264263
log_d(
265264
"%s: %u / %u = %u Mhz, APB: %u Hz",
266-
(conf.source == SOC_CPU_CLK_SRC_PLL) ? "PLL"
267-
: ((conf.source == SOC_CPU_CLK_SRC_APLL) ? "APLL"
268-
: ((conf.source == SOC_CPU_CLK_SRC_XTAL) ? "XTAL"
269-
#ifdef CONFIG_IDF_TARGET_ESP32P4
270-
: "17.5M")),
271-
#else
272-
: "8M")),
273-
#endif
265+
(conf.source == SOC_CPU_CLK_SRC_PLL) ? "PLL" : ((conf.source == SOC_CPU_CLK_SRC_APLL) ? "APLL" : ((conf.source == SOC_CPU_CLK_SRC_XTAL) ? "XTAL" : "8M")),
274266
conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
275267
);
276268
#else
@@ -279,7 +271,6 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
279271
conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
280272
);
281273
#endif
282-
// clang-format on
283274
return true;
284275
}
285276

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.