diff --git a/components/esp_system/port/soc/esp32/clk.c b/components/esp_system/port/soc/esp32/clk.c index 9dccb46dbe..2133cc8b25 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 3021f6ffc3..b5f530b411 100644 --- a/components/esp_system/port/soc/esp32c3/clk.c +++ b/components/esp_system/port/soc/esp32c3/clk.c @@ -176,11 +176,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/esp32h2/clk.c b/components/esp_system/port/soc/esp32h2/clk.c index 92725410bb..44eb012692 100644 --- a/components/esp_system/port/soc/esp32h2/clk.c +++ b/components/esp_system/port/soc/esp32h2/clk.c @@ -166,10 +166,8 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk) 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(); } diff --git a/components/esp_system/port/soc/esp32s2/clk.c b/components/esp_system/port/soc/esp32s2/clk.c index b818747346..bb43f3c8e6 100644 --- a/components/esp_system/port/soc/esp32s2/clk.c +++ b/components/esp_system/port/soc/esp32s2/clk.c @@ -181,11 +181,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 808c07f6c4..cd33cc210a 100644 --- a/components/esp_system/port/soc/esp32s3/clk.c +++ b/components/esp_system/port/soc/esp32s3/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.