From d63beec0952db4e16f351e080267a1868b869548 Mon Sep 17 00:00:00 2001 From: Li Shuai Date: Wed, 26 Jun 2024 20:38:39 +0800 Subject: [PATCH] change(esp_wifi): support legacy wifi power save for esp32c5 --- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 2 +- components/esp_wifi/lib | 2 +- components/soc/esp32c5/include/soc/Kconfig.soc_caps.in | 8 ++++++++ components/soc/esp32c5/include/soc/soc_caps.h | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 59e9a49df3..a72cb8e5b7 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -55,7 +55,7 @@ dbg_hal_check_clr_mplen_bitmap = 0x40000c6c; dbg_hal_check_set_mplen_bitmap = 0x40000c70; ic_get_trc = 0x40000c74; ic_mac_deinit = 0x40000c78; -ic_mac_init = 0x40000c7c; +/* ic_mac_init = 0x40000c7c; */ ic_interface_enabled = 0x40000c80; is_lmac_idle = 0x40000c84; ic_get_he_rts_threshold_bytes = 0x40000c88; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 6b249f7335..ad8411567d 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 6b249f7335ed8e341c111a51b4d368d1825ac3c6 +Subproject commit ad8411567dc96a9d7fd13d275e6657c223287388 diff --git a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in index b2236ecd95..6763369e58 100644 --- a/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c5/include/soc/Kconfig.soc_caps.in @@ -1251,6 +1251,10 @@ config SOC_PM_SUPPORT_EXT1_WAKEUP_MODE_PER_PIN bool default y +config SOC_PM_SUPPORT_WIFI_WAKEUP + bool + default y + config SOC_PM_SUPPORT_CPU_PD bool default y @@ -1283,6 +1287,10 @@ config SOC_PM_SUPPORT_HP_AON_PD bool default y +config SOC_PM_SUPPORT_MAC_BB_PD + bool + default y + config SOC_PM_SUPPORT_RTC_PERIPH_PD bool default y diff --git a/components/soc/esp32c5/include/soc/soc_caps.h b/components/soc/esp32c5/include/soc/soc_caps.h index fcd5bacef4..64c1da610d 100644 --- a/components/soc/esp32c5/include/soc/soc_caps.h +++ b/components/soc/esp32c5/include/soc/soc_caps.h @@ -539,7 +539,7 @@ #define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH (12) /*-------------------------- Power Management CAPS ----------------------------*/ -// #define SOC_PM_SUPPORT_WIFI_WAKEUP (1) +#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) // #define SOC_PM_SUPPORT_BEACON_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_EXT1_WAKEUP (1) @@ -552,7 +552,7 @@ #define SOC_PM_SUPPORT_VDDSDIO_PD (1) #define SOC_PM_SUPPORT_TOP_PD (1) #define SOC_PM_SUPPORT_HP_AON_PD (1) -// #define SOC_PM_SUPPORT_MAC_BB_PD (1) +#define SOC_PM_SUPPORT_MAC_BB_PD (1) #define SOC_PM_SUPPORT_RTC_PERIPH_PD (1) // #define SOC_PM_SUPPORT_PMU_MODEM_STATE (1)