Merge branch 'feature/esp32p4_mcpwm_support' into 'master'

feat(MCPWM): Add support for ESP32P4

Closes IDF-7493

See merge request espressif/esp-idf!25029

components/driver/Kconfig

@@ -368,39 +368,7 @@ menu "Driver Configurations"
                 Note that, this option only controls the RMT driver log, won't affect other drivers.
     endmenu # RMT Configuration
 
-    menu "MCPWM Configuration"
-        depends on SOC_MCPWM_SUPPORTED
-        config MCPWM_ISR_IRAM_SAFE
-            bool "Place MCPWM ISR function into IRAM"
-            default n
-            help
-                This will ensure the MCPWM interrupt handle is IRAM-Safe, allow to avoid flash
-                cache misses, and also be able to run whilst the cache is disabled.
-                (e.g. SPI Flash write)
-
-        config MCPWM_CTRL_FUNC_IN_IRAM
-            bool "Place MCPWM control functions into IRAM"
-            default n
-            help
-                Place MCPWM control functions (like set_compare_value) into IRAM,
-                so that these functions can be IRAM-safe and able to be called in the other IRAM interrupt context.
-                Enabling this option can improve driver performance as well.
-
-        config MCPWM_SUPPRESS_DEPRECATE_WARN
-            bool "Suppress leagcy driver deprecated warning"
-            default n
-            help
-                Wether to suppress the deprecation warnings when using legacy MCPWM driver (driver/mcpwm.h).
-                If you want to continue using the legacy driver, and don't want to see related deprecation warnings,
-                you can enable this option.
-
-        config MCPWM_ENABLE_DEBUG_LOG
-            bool "Enable debug log"
-            default n
-            help
-                Wether to enable the debug log message for MCPWM driver.
-                Note that, this option only controls the MCPWM driver log, won't affect other drivers.
-    endmenu # MCPWM Configuration
+    orsource "./mcpwm/Kconfig.mcpwm"
 
     menu "I2S Configuration"
         depends on SOC_I2S_SUPPORTED

components/driver/mcpwm/Kconfig.mcpwm

@@ -0,0 +1,33 @@
+menu "MCPWM Configuration"
+    depends on SOC_MCPWM_SUPPORTED
+    config MCPWM_ISR_IRAM_SAFE
+        bool "Place MCPWM ISR function into IRAM"
+        default n
+        help
+            This will ensure the MCPWM interrupt handle is IRAM-Safe, allow to avoid flash
+            cache misses, and also be able to run whilst the cache is disabled.
+            (e.g. SPI Flash write)
+
+    config MCPWM_CTRL_FUNC_IN_IRAM
+        bool "Place MCPWM control functions into IRAM"
+        default n
+        help
+            Place MCPWM control functions (like set_compare_value) into IRAM,
+            so that these functions can be IRAM-safe and able to be called in the other IRAM interrupt context.
+            Enabling this option can improve driver performance as well.
+
+    config MCPWM_SUPPRESS_DEPRECATE_WARN
+        bool "Suppress leagcy driver deprecated warning"
+        default n
+        help
+            Wether to suppress the deprecation warnings when using legacy MCPWM driver (driver/mcpwm.h).
+            If you want to continue using the legacy driver, and don't want to see related deprecation warnings,
+            you can enable this option.
+
+    config MCPWM_ENABLE_DEBUG_LOG
+        bool "Enable debug log"
+        default n
+        help
+            Wether to enable the debug log message for MCPWM driver.
+            Note that, this option only controls the MCPWM driver log, won't affect other drivers.
+endmenu # MCPWM Configuration

components/driver/test_apps/mcpwm/main/test_mcpwm_cap.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -111,9 +111,9 @@ TEST_CASE("mcpwm_capture_ext_gpio", "[mcpwm]")
 
     printf("simulate GPIO capture signal\r\n");
     gpio_set_level(cap_gpio, 1);
-    vTaskDelay(pdMS_TO_TICKS(10));
+    esp_rom_delay_us(10 * 1000);
     gpio_set_level(cap_gpio, 0);
-    vTaskDelay(pdMS_TO_TICKS(10));
+    esp_rom_delay_us(10 * 1000);
     printf("capture value: Pos=%"PRIu32", Neg=%"PRIu32"\r\n", cap_value[0], cap_value[1]);
     uint32_t clk_src_res;
     TEST_ESP_OK(mcpwm_capture_timer_get_resolution(cap_timer, &clk_src_res));
@@ -176,10 +176,9 @@ TEST_CASE("mcpwm_capture_software_catch", "[mcpwm]")
 
     printf("trigger software catch\r\n");
     TEST_ESP_OK(mcpwm_capture_channel_trigger_soft_catch(cap_channel));
-    vTaskDelay(pdMS_TO_TICKS(10));
+    esp_rom_delay_us(10 * 1000);
     TEST_ESP_OK(mcpwm_capture_channel_trigger_soft_catch(cap_channel));
-    vTaskDelay(pdMS_TO_TICKS(10));
-
+    esp_rom_delay_us(10 * 1000);
     // check user data
     TEST_ASSERT_EQUAL(2, test_callback_data.cap_data_index);
     uint32_t delta = test_callback_data.cap_data[1] - test_callback_data.cap_data[0];

components/driver/test_apps/mcpwm/main/test_mcpwm_cmpr.c

@@ -100,7 +100,7 @@ TEST_CASE("mcpwm_comparator_event_callback", "[mcpwm]")
     TEST_ESP_OK(mcpwm_timer_enable(timer));
     TEST_ESP_OK(mcpwm_timer_start_stop(timer, MCPWM_TIMER_START_NO_STOP));
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
+    esp_rom_delay_us(1000 * 1000);
     TEST_ESP_OK(mcpwm_timer_start_stop(timer, MCPWM_TIMER_STOP_EMPTY));
     printf("compare_counts=%"PRIu32"\r\n", compare_counts);
     // the timer period is 10ms, the expected compare_counts = 1s/10ms = 100

components/driver/test_apps/mcpwm/main/test_mcpwm_timer.c

@@ -169,7 +169,7 @@ TEST_CASE("mcpwm_timer_event_callbacks", "[mcpwm]")
     TEST_ESP_OK(mcpwm_timer_start_stop(timer, MCPWM_TIMER_START_NO_STOP));
 
     printf("wait for full and empty events\r\n");
-    bits = xEventGroupWaitBits(event_group, TEST_MCPWM_TIMER_EVENT_BIT_FULL | TEST_MCPWM_TIMER_EVENT_BIT_EMPTY, pdTRUE, pdTRUE, pdMS_TO_TICKS(1050));
+    bits = xEventGroupWaitBits(event_group, TEST_MCPWM_TIMER_EVENT_BIT_FULL | TEST_MCPWM_TIMER_EVENT_BIT_EMPTY, pdTRUE, pdTRUE, pdMS_TO_TICKS(1300));
     TEST_ASSERT_EQUAL(TEST_MCPWM_TIMER_EVENT_BIT_FULL | TEST_MCPWM_TIMER_EVENT_BIT_EMPTY, bits);
 
     printf("stop timer and wait for event\r\n");

components/hal/esp32p4/include/hal/clk_gate_ll.h

@@ -77,9 +77,9 @@ static inline uint32_t periph_ll_get_clk_en_mask(periph_module_t periph)
     case PERIPH_CAM_MODULE:
         return HP_SYS_CLKRST_REG_CAM_CLK_EN;
     case PERIPH_MCPWM0_MODULE:
-        return HP_SYS_CLKRST_REG_MCPWM0_CLK_EN;
+        return HP_SYS_CLKRST_REG_MCPWM0_APB_CLK_EN;
     case PERIPH_MCPWM1_MODULE:
-        return HP_SYS_CLKRST_REG_MCPWM1_CLK_EN;
+        return HP_SYS_CLKRST_REG_MCPWM1_APB_CLK_EN;
     case PERIPH_TIMG0_MODULE:
         return HP_SYS_CLKRST_REG_TIMERGRP0_T0_CLK_EN | HP_SYS_CLKRST_REG_TIMERGRP0_T1_CLK_EN | HP_SYS_CLKRST_REG_TIMERGRP0_WDT_CLK_EN;
     case PERIPH_TIMG1_MODULE:
@@ -264,6 +264,7 @@ static inline uint32_t periph_ll_get_clk_en_reg(periph_module_t periph)
         return HP_SYS_CLKRST_PERI_CLK_CTRL119_REG;
     case PERIPH_MCPWM0_MODULE:
     case PERIPH_MCPWM1_MODULE:
+        return HP_SYS_CLKRST_SOC_CLK_CTRL2_REG;
     case PERIPH_TIMG0_MODULE:
         return HP_SYS_CLKRST_PERI_CLK_CTRL20_REG;
     case PERIPH_TIMG1_MODULE: