Merge branch 'feat/mcpwm_sleep_retention_support_p4' into 'master'

feat(mcpwm): support mcpwm sleep retention on p4

Closes IDF-9928

See merge request espressif/esp-idf!35059

Author: Kainarx

components/esp_driver_mcpwm/test_apps/mcpwm/main/CMakeLists.txt

@@ -17,8 +17,7 @@ if(CONFIG_SOC_ETM_SUPPORTED AND CONFIG_SOC_MCPWM_SUPPORT_ETM)
     list(APPEND srcs "test_mcpwm_etm.c")
 endif()
 
-# TODO: IDF-9928 support ESP32P4
-if(CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_PM_ENABLE AND NOT CONFIG_IDF_TARGET_ESP32P4)
+if(CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_PM_ENABLE)
     list(APPEND srcs "test_mcpwm_sleep.c")
 endif()
 

components/esp_driver_pcnt/test_apps/pulse_cnt/main/CMakeLists.txt

@@ -6,8 +6,7 @@ if(CONFIG_PCNT_ISR_IRAM_SAFE)
     list(APPEND srcs "test_pulse_cnt_iram.c")
 endif()
 
-# TODO: IDF-9907 support ESP32P4
-if(CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_PM_ENABLE AND NOT CONFIG_IDF_TARGET_ESP32P4)
+if(CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_PM_ENABLE)
     list(APPEND srcs "test_pulse_cnt_sleep.c")
 endif()
 

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

@@ -1131,6 +1131,10 @@ config SOC_PCNT_SUPPORT_CLEAR_SIGNAL
     bool
     default y
 
+config SOC_PCNT_SUPPORT_SLEEP_RETENTION
+    bool
+    default y
+
 config SOC_RMT_GROUPS
     int
     default 1
@@ -1283,6 +1287,10 @@ config SOC_MCPWM_CAPTURE_CLK_FROM_GROUP
     bool
     default y
 
+config SOC_MCPWM_SUPPORT_SLEEP_RETENTION
+    bool
+    default y
+
 config SOC_USB_OTG_PERIPH_NUM
     int
     default 2

components/soc/esp32p4/include/soc/retention_periph_defs.h

@@ -54,6 +54,9 @@ typedef enum periph_retention_module {
     SLEEP_RETENTION_MODULE_GPSPI2       = 29,
     SLEEP_RETENTION_MODULE_GPSPI3       = 30,
     SLEEP_RETENTION_MODULE_LEDC         = 31,
+    SLEEP_RETENTION_MODULE_MCPWM0       = 32,
+    SLEEP_RETENTION_MODULE_MCPWM1       = 33,
+    SLEEP_RETENTION_MODULE_PCNT0        = 34,
 
     SLEEP_RETENTION_MODULE_MAX          = SOC_PM_RETENTION_MODULE_NUM - 1
 } periph_retention_module_t;
@@ -91,6 +94,9 @@ typedef enum periph_retention_module {
     : ((m) == SLEEP_RETENTION_MODULE_GPSPI2)       ? true \
     : ((m) == SLEEP_RETENTION_MODULE_GPSPI3)       ? true \
     : ((m) == SLEEP_RETENTION_MODULE_LEDC)         ? true \
+    : ((m) == SLEEP_RETENTION_MODULE_MCPWM0)       ? true \
+    : ((m) == SLEEP_RETENTION_MODULE_MCPWM1)       ? true \
+    : ((m) == SLEEP_RETENTION_MODULE_PCNT0)        ? true \
     : false)
 
 #ifdef __cplusplus

components/soc/esp32p4/include/soc/soc_caps.h

@@ -410,7 +410,7 @@
 #define SOC_PCNT_THRES_POINT_PER_UNIT         2
 #define SOC_PCNT_SUPPORT_RUNTIME_THRES_UPDATE 1
 #define SOC_PCNT_SUPPORT_CLEAR_SIGNAL         1  /*!< Support clear signal input */
-// #define SOC_PCNT_SUPPORT_SLEEP_RETENTION      1  // TODO: IDF-9907 Waiting for expansion of module ID /*!< The sleep retention feature can help back up PCNT registers before sleep */
+#define SOC_PCNT_SUPPORT_SLEEP_RETENTION      1  /*!< The sleep retention feature can help back up PCNT registers before sleep */
 
 /*--------------------------- RMT CAPS ---------------------------------------*/
 #define SOC_RMT_GROUPS                        1U /*!< One RMT group */
@@ -456,7 +456,7 @@
 #define SOC_MCPWM_SUPPORT_ETM                (1)    ///< Support ETM (Event Task Matrix)
 #define SOC_MCPWM_SUPPORT_EVENT_COMPARATOR   (1)    ///< Support event comparator (based on ETM)
 #define SOC_MCPWM_CAPTURE_CLK_FROM_GROUP     (1)    ///< Capture timer shares clock with other PWM timers
-// #define SOC_MCPWM_SUPPORT_SLEEP_RETENTION    (1)   // TODO: IDF-9928 Waiting for expansion of module ID  ///< Support back up registers before sleep
+#define SOC_MCPWM_SUPPORT_SLEEP_RETENTION    (1)    ///< Support back up registers before sleep
 
 /*-------------------------- USB CAPS ----------------------------------------*/
 // USB Serial JTAG Caps

components/soc/esp32p4/mcpwm_periph.c

@@ -6,6 +6,7 @@
 
 #include "soc/soc.h"
 #include "soc/mcpwm_periph.h"
+#include "soc/mcpwm_reg.h"
 #include "soc/gpio_sig_map.h"
 
 const mcpwm_signal_conn_t mcpwm_periph_signals = {