diff --git a/components/esp_phy/esp32c6/include/phy_init_data.h b/components/esp_phy/esp32c6/include/phy_init_data.h
index aa6e9b4030..af2c511b03 100644
--- a/components/esp_phy/esp32c6/include/phy_init_data.h
+++ b/components/esp_phy/esp32c6/include/phy_init_data.h
@@ -37,8 +37,8 @@ static const char __attribute__((section(".rodata"))) phy_init_magic_pre[] = PHY
  * @brief Structure containing default recommended PHY initialization parameters.
  */
 static const esp_phy_init_data_t phy_init_data= { {
-        0x01,
-        0x00,
+        0xa,
+        0x0,
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54),
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54),
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
@@ -53,60 +53,62 @@ static const esp_phy_init_data_t phy_init_data= { {
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
         LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
+        LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
+        LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
+        LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
+        LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
+        0x0,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
         0x00,
         0x00,
         0x00,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
-        0xff,
         0,
         0,
         0,
@@ -162,9 +164,7 @@ static const esp_phy_init_data_t phy_init_data= { {
         0,
         0,
         0,
-        0,
-        0,
-        0x70
+        0x51
 } };
 
 static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
index 43cbd223bc..661c0f2e08 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
@@ -24,7 +24,7 @@ pm_check_state = 0x40001b6c;
 pm_dream = 0x40001b78;
 pm_on_beacon_rx = 0x40001ba0;
 //pm_parse_beacon = 0x40001bac;
-pm_process_tim = 0x40001bb0;
+//pm_process_tim = 0x40001bb0;
 pm_rx_beacon_process = 0x40001bb4;
 pm_rx_data_process = 0x40001bb8;
 pm_sleep = 0x40001bbc;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
index 41445a1b54..73d17bd348 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -17,7 +17,7 @@ mac_tx_set_plcp1 = 0x40001640;
 pm_check_state = 0x40001648;
 /*pm_on_beacon_rx = 0x4000167c;*/
 /*pm_parse_beacon = 0x40001688;*/
-pm_process_tim = 0x4000168c;
+/*pm_process_tim = 0x4000168c;*/
 pm_rx_beacon_process = 0x40001690;
 pm_rx_data_process = 0x40001694;
 /* pm_sleep = 0x40001698;*/
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index a237700ff5..83a36a1c1b 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit a237700ff58d34f54c8d0ac9e09f65ad4996531e
+Subproject commit 83a36a1c1b4b9746545d10358228f04487ad3827