Merge branch 'feat/lcd_use_apll_clock' into 'master'

refactor(clk_tree): use general api to enable the clk

Closes IDF-11478 and IDF-12972

See merge request espressif/esp-idf!35952

components/esp_hal_regi2c/test_apps/main/test_regi2c.c

@@ -9,6 +9,7 @@
 #include "unity.h"
 #include "test_regi2c.h"
 #include "esp_private/regi2c_ctrl.h"
+#include "esp_private/esp_clk_tree_common.h"
 #include "sdkconfig.h"
 
 TEST_CASE("regi2c basic read/write test", "[regi2c]")
@@ -19,7 +20,7 @@ TEST_CASE("regi2c basic read/write test", "[regi2c]")
 
 #if CONFIG_IDF_TARGET_ESP32
     // For ESP32, we need to enable the APLL clock before accessing the APLL regi2c registers
-    periph_rtc_apll_acquire();
+    TEST_ESP_OK(esp_clk_tree_enable_src(SOC_MOD_CLK_APLL, true));
 #endif
 
     /* ---- Part 1: full-register read / write ---- */
@@ -91,6 +92,6 @@ TEST_CASE("regi2c basic read/write test", "[regi2c]")
 
 #if CONFIG_IDF_TARGET_ESP32
     // Disable APLL clock
-    periph_rtc_apll_release();
+    TEST_ESP_OK(esp_clk_tree_enable_src(SOC_MOD_CLK_APLL, false));
 #endif
 }

components/esp_hal_regi2c/test_apps/main/test_regi2c.h

@@ -25,7 +25,6 @@ extern "C" {
 
 #if CONFIG_IDF_TARGET_ESP32
 
-#include "clk_ctrl_os.h"
 #include "soc/regi2c_apll.h"
 #define TEST_BLOCK          I2C_APLL
 #define TEST_HOST_ID        I2C_APLL_HOSTID