Merge branch 'release/v6.0' into 'feat/mcpwm_support_h4_v6.0'

# Conflicts:
#   docs/docs_not_updated/esp32h4.txt

components/soc/esp32h4/etm_periph.c

@@ -1,44 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "soc/etm_periph.h"
-#include "soc/soc_etm_reg.h"
-
-/**
- * ETM Registers to be saved during sleep retention
- * - Channel configuration registers, e.g.: SOC_ETM_CH0_EVT_ID_REG, SOC_ETM_CH0_TASK_ID_REG
-*/
-#define ETM_RETENTION_REGS_CNT ((SOC_ETM_CH49_TASK_ID_REG - SOC_ETM_CH0_EVT_ID_REG) / 4 + 1)
-
-static const regdma_entries_config_t etm_regdma_entries[] = {
-    // backup stage: save the status of enabled channels
-    // restore stage: store the enabled channels
-    [0] = {
-        .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_ETM_LINK(0x00),
-                                              SOC_ETM_CH_ENA_AD0_REG, SOC_ETM_CH_ENA_AD0_SET_REG, 1, 0, 0),
-        .owner = ENTRY(0) | ENTRY(2),
-    },
-    [1] = {
-        .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_ETM_LINK(0x01),
-                                              SOC_ETM_CH_ENA_AD1_REG, SOC_ETM_CH_ENA_AD1_SET_REG, 1, 0, 0),
-        .owner = ENTRY(0) | ENTRY(2),
-    },
-    // backup stage: save configuration registers
-    // restore stage: restore the configuration registers
-    [2] = {
-        .config = REGDMA_LINK_CONTINUOUS_INIT(REGDMA_ETM_LINK(0x02),
-                                              SOC_ETM_CH0_EVT_ID_REG, SOC_ETM_CH0_EVT_ID_REG, ETM_RETENTION_REGS_CNT, 0, 0),
-        .owner = ENTRY(0) | ENTRY(2),
-    },
-};
-
-const soc_etm_retention_desc_t soc_etm_retention_info[1] = {
-    [0] = {
-        .module = SLEEP_RETENTION_MODULE_ETM0,
-        .regdma_entry_array = etm_regdma_entries,
-        .array_size = ARRAY_SIZE(etm_regdma_entries)
-    },
-};

components/soc/esp32h4/include/soc/soc_caps_full.h

@@ -19,10 +19,6 @@
 #define _SOC_CAPS_PCNT_CHANS_PER_UNIT             2  // Number of channels in each PCNT unit
 #define _SOC_CAPS_PCNT_THRES_POINT_PER_UNIT       2  // Number of threshold points in each PCNT unit
 
-/*--------------------------- ETM (Event Task Matrix) ----------------------------*/
-#define _SOC_CAPS_ETM_INST_NUM                    1  // Number of ETM instances
-#define _SOC_CAPS_ETM_CHANS_PER_INST              50 // Number of channels in each ETM instance
-
 /*------------------------------- I2S ---------------------------------------*/
 // helper macros to access module attributes
 #define _SOC_CAPS_I2S_INST_NUM                    1  // Number of I2S instances

components/soc/esp32h4/usb_dwc_periph.c

@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-#include "soc/gpio_sig_map.h"
-#include "soc/interrupts.h"
-#include "soc/usb_periph.h"
-
-/* -------------------------------- Private --------------------------------- */
-
-static const usb_otg_signal_conn_t otg_signals = {
-    // Inputs
-    .iddig = USB_OTG_IDDIG_IN_IDX,
-    .avalid = USB_OTG_AVALID_IN_IDX,
-    .bvalid = USB_SRP_BVALID_IN_IDX,
-    .vbusvalid = USB_OTG_VBUSVALID_IN_IDX,
-    .sessend = USB_SRP_SESSEND_IN_IDX,
-    // Outputs
-    .idpullup = USB_OTG_IDPULLUP_OUT_IDX,
-    .dppulldown = USB_OTG_DPPULLDOWN_OUT_IDX,
-    .dmpulldown = USB_OTG_DMPULLDOWN_OUT_IDX,
-    .drvvbus = USB_OTG_DRVVBUS_OUT_IDX,
-    .chrgvbus = USB_SRP_CHRGVBUS_OUT_IDX,
-    .dischrgvbus = USB_SRP_DISCHRGVBUS_OUT_IDX,
-};
-
-static const usb_internal_phy_io_t internal_phy_io = {
-    .dp = 21,
-    .dm = 22,
-};
-
-/* --------------------------------- Public --------------------------------- */
-
-const usb_dwc_info_t usb_dwc_info = {
-    .controllers = {
-        [0] = {
-            .fsls_signals = NULL,
-            .otg_signals = &otg_signals,
-            .internal_phy_io = &internal_phy_io,
-            .supported_phys = USB_PHY_INST_FSLS_INTERN_0,
-            .irq = ETS_USB_OTG11_INTR_SOURCE,
-            .irq_2nd_cpu = -1,
-        },
-    },
-};