Merge branch 'fix/use_conflict_cb_for_regi2c_when_regdma_rf_is_used' into 'master'

feat(sleep): applied regi2c conflict process at regdma rf

See merge request espressif/esp-idf!51770
This commit is contained in:
Island
2026-08-17 14:43:56 +08:00
11 changed files with 124 additions and 4 deletions
@@ -1583,6 +1583,10 @@ config SOC_PM_SUPPORT_PMU_MODEM_STATE
bool
default y
config SOC_PM_REGDMA_MODEM_LINK_PROTECT
bool
default y
config SOC_PM_MODEM_STATE_USE_XTAL
bool
default y
@@ -586,6 +586,7 @@
#define SOC_PM_SUPPORT_REGDMA_TRIGGERED_PHY (1)
#define SOC_PM_SUPPORT_PMU_MODEM_STATE (1)
#define MAC_SUPPORT_PMU_MODEM_STATE SOC_PM_SUPPORT_PMU_MODEM_STATE
#define SOC_PM_REGDMA_MODEM_LINK_PROTECT (1)
/* Since SOC APB and MODEM APB on ESP32-S31 are decoupled, XTAL can be used as SOC clock in modem state */
#define SOC_PM_MODEM_STATE_USE_XTAL (1)