diff --git a/components/esp_system/port/soc/esp32/clk.c b/components/esp_system/port/soc/esp32/clk.c index ac60eb03e7..e99ed451fa 100644 --- a/components/esp_system/port/soc/esp32/clk.c +++ b/components/esp_system/port/soc/esp32/clk.c @@ -92,11 +92,8 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk) } rtc_clk_slow_src_set(rtc_slow_clk_src); if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { - if (slow_clk == SLOW_CLK_32K_XTAL) { - rtc_clk_32k_enable(false); - } else if (slow_clk == SLOW_CLK_32K_EXT_OSC) { - rtc_clk_32k_disable_external(); - } + rtc_clk_32k_enable(false); + rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { /* TODO: 32k XTAL oscillator has some frequency drift at startup. diff --git a/components/esp_system/port/soc/esp32c3/clk.c b/components/esp_system/port/soc/esp32c3/clk.c index cc56b8abc1..d7d6b53624 100644 --- a/components/esp_system/port/soc/esp32c3/clk.c +++ b/components/esp_system/port/soc/esp32c3/clk.c @@ -177,11 +177,8 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk) } rtc_clk_slow_src_set(rtc_slow_clk_src); if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { - if (slow_clk == SLOW_CLK_32K_XTAL) { - rtc_clk_32k_enable(false); - } else if (slow_clk == SLOW_CLK_32K_EXT_OSC) { - rtc_clk_32k_disable_external(); - } + rtc_clk_32k_enable(false); + rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { /* TODO: 32k XTAL oscillator has some frequency drift at startup. diff --git a/components/esp_system/port/soc/esp32c5/clk.c b/components/esp_system/port/soc/esp32c5/clk.c index b4d872f450..836286748c 100644 --- a/components/esp_system/port/soc/esp32c5/clk.c +++ b/components/esp_system/port/soc/esp32c5/clk.c @@ -169,10 +169,8 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src) rtc_clk_slow_src_set(rtc_slow_clk_src); // Disable unused clock sources after clock source switching is complete. // Regardless of the clock source selection, the internal 136K clock source will always keep on. - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { + if ((rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) && (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW)) { rtc_clk_32k_enable(false); - } - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW) { rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { diff --git a/components/esp_system/port/soc/esp32c6/clk.c b/components/esp_system/port/soc/esp32c6/clk.c index 9d870104e6..e893c6d3e5 100644 --- a/components/esp_system/port/soc/esp32c6/clk.c +++ b/components/esp_system/port/soc/esp32c6/clk.c @@ -187,10 +187,8 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src) rtc_clk_slow_src_set(rtc_slow_clk_src); // Disable unused clock sources after clock source switching is complete. // Regardless of the clock source selection, the internal 136K clock source will always keep on. - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { + if ((rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) && (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW)) { rtc_clk_32k_enable(false); - } - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW) { rtc_clk_32k_disable_external(); } if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_RC32K) { diff --git a/components/esp_system/port/soc/esp32c61/clk.c b/components/esp_system/port/soc/esp32c61/clk.c index 2a91bcc2e9..0e51476772 100644 --- a/components/esp_system/port/soc/esp32c61/clk.c +++ b/components/esp_system/port/soc/esp32c61/clk.c @@ -150,10 +150,8 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src) rtc_clk_slow_src_set(rtc_slow_clk_src); // Disable unused clock sources after clock source switching is complete. // Regardless of the clock source selection, the internal 136K clock source will always keep on. - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { + if ((rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) && (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW)) { rtc_clk_32k_enable(false); - } - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW) { rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { diff --git a/components/esp_system/port/soc/esp32h2/clk.c b/components/esp_system/port/soc/esp32h2/clk.c index f48f7114b2..7a4a902ec7 100644 --- a/components/esp_system/port/soc/esp32h2/clk.c +++ b/components/esp_system/port/soc/esp32h2/clk.c @@ -185,10 +185,8 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src) rtc_clk_slow_src_set(rtc_slow_clk_src); // Disable unused clock sources after clock source switching is complete. // Regardless of the clock source selection, the internal 136K clock source will always keep on. - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { + if ((rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) && (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW)) { rtc_clk_32k_enable(false); - } - if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_OSC_SLOW) { rtc_clk_32k_disable_external(); } if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_RC32K) { diff --git a/components/esp_system/port/soc/esp32s2/clk.c b/components/esp_system/port/soc/esp32s2/clk.c index 371018e3b5..0335b56a22 100644 --- a/components/esp_system/port/soc/esp32s2/clk.c +++ b/components/esp_system/port/soc/esp32s2/clk.c @@ -180,11 +180,8 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk) } rtc_clk_slow_src_set(rtc_slow_clk_src); if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { - if (slow_clk == SLOW_CLK_32K_XTAL) { - rtc_clk_32k_enable(false); - } else if (slow_clk == SLOW_CLK_32K_EXT_OSC) { - rtc_clk_32k_disable_external(); - } + rtc_clk_32k_enable(false); + rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { /* TODO: 32k XTAL oscillator has some frequency drift at startup. diff --git a/components/esp_system/port/soc/esp32s3/clk.c b/components/esp_system/port/soc/esp32s3/clk.c index b18ca20336..3c3fd96ff0 100644 --- a/components/esp_system/port/soc/esp32s3/clk.c +++ b/components/esp_system/port/soc/esp32s3/clk.c @@ -178,11 +178,8 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk) } rtc_clk_slow_src_set(rtc_slow_clk_src); if (rtc_slow_clk_src != SOC_RTC_SLOW_CLK_SRC_XTAL32K) { - if (slow_clk == SLOW_CLK_32K_XTAL) { - rtc_clk_32k_enable(false); - } else if (slow_clk == SLOW_CLK_32K_EXT_OSC) { - rtc_clk_32k_disable_external(); - } + rtc_clk_32k_enable(false); + rtc_clk_32k_disable_external(); } if (SLOW_CLK_CAL_CYCLES > 0) { /* TODO: 32k XTAL oscillator has some frequency drift at startup.