Merge branch 'feat/esp_idf_h4_retention_clk_icg' into 'master'

feat(esp_hw_support): refactor PMU sleep icg and support retention ICG

See merge request espressif/esp-idf!48915

components/soc/esp32h21/include/soc/Kconfig.soc_caps.in

@@ -1043,6 +1043,10 @@ config SOC_PM_SUPPORT_PMU_CLK_ICG
     bool
     default y
 
+config SOC_PM_SUPPORT_PMU_RETENTION_CLK_ICG
+    bool
+    default y
+
 config SOC_PM_FLASH_KEEP_POWER_IN_LSLP
     bool
     default y

components/soc/esp32h21/include/soc/pmu_icg_mapping.h

@@ -71,8 +71,7 @@
 extern "C" {
 #endif
 
-typedef uint32_t pmu_sleep_clk_icg_flags_t;
-#define PMU_SLEEP_CLK_ICG_BIT(b)       (((pmu_sleep_clk_icg_flags_t)1) << (b))
+#define PMU_SLEEP_CLK_ICG_BIT(b)       (((uint32_t)1) << (b))
 
 #ifdef __cplusplus
 }

components/soc/esp32h21/include/soc/soc_caps.h

@@ -456,6 +456,7 @@
 #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY   (1) /*!<Supports CRC only the stub code in RTC memory */
 
 #define SOC_PM_SUPPORT_PMU_CLK_ICG          (1)
+#define SOC_PM_SUPPORT_PMU_RETENTION_CLK_ICG   (1)
 
 #define SOC_PM_FLASH_KEEP_POWER_IN_LSLP     (1)  /*!<Keep flash on in light sleep to reduce wake latency*/