diff --git a/components/esp_hw_support/port/esp32c3/regi2c_ctrl.h b/components/esp_hw_support/port/esp32c3/regi2c_ctrl.h
index cec9f76d97..dbca47e01f 100644
--- a/components/esp_hw_support/port/esp32c3/regi2c_ctrl.h
+++ b/components/esp_hw_support/port/esp32c3/regi2c_ctrl.h
@@ -40,6 +40,10 @@ extern "C" {
 #endif
 
 /* Analog function control register */
+#define I2C_MST_ANA_CONF0_REG  0x6000E040
+#define I2C_MST_BBPLL_STOP_FORCE_HIGH  (BIT(2))
+#define I2C_MST_BBPLL_STOP_FORCE_LOW  (BIT(3))
+
 #define ANA_CONFIG_REG  0x6000E044
 #define ANA_CONFIG_S    (8)
 #define ANA_CONFIG_M    (0x3FF)
diff --git a/components/esp_hw_support/port/esp32c3/rtc_clk.c b/components/esp_hw_support/port/esp32c3/rtc_clk.c
index d9b193fb9c..93314b7dc6 100644
--- a/components/esp_hw_support/port/esp32c3/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32c3/rtc_clk.c
@@ -221,6 +221,8 @@ void rtc_clk_bbpll_configure(rtc_xtal_freq_t xtal_freq, int pll_freq)
     uint8_t dcur;
     uint8_t dbias;
 
+    CLEAR_PERI_REG_MASK(I2C_MST_ANA_CONF0_REG, I2C_MST_BBPLL_STOP_FORCE_HIGH);
+    SET_PERI_REG_MASK(I2C_MST_ANA_CONF0_REG, I2C_MST_BBPLL_STOP_FORCE_LOW);
     if (pll_freq == RTC_PLL_FREQ_480M) {
         /* Set this register to let the digital part know 480M PLL is used */
         SET_PERI_REG_MASK(SYSTEM_CPU_PER_CONF_REG, SYSTEM_PLL_FREQ_SEL);
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 0ef0ffd9b4..fa88af2ecb 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1818,7 +1818,7 @@ rom_i2c_readReg = 0x40001954;
 rom_i2c_readReg_Mask = 0x40001958;
 rom_i2c_writeReg = 0x4000195c;
 rom_i2c_writeReg_Mask = 0x40001960;
-rom_index_to_txbbgain = 0x40001964;
+/* rom_index_to_txbbgain = 0x40001964; */
 rom_iq_est_disable = 0x40001968;
 rom_iq_est_enable = 0x4000196c;
 rom_linear_to_db = 0x40001970;
@@ -1853,14 +1853,14 @@ rom_set_chan_cal_interp = 0x400019e0;
 rom_set_loopback_gain = 0x400019e4;
 rom_set_noise_floor = 0x400019e8;
 rom_set_rxclk_en = 0x400019ec;
-rom_set_tx_dig_gain = 0x400019f0;
+/* rom_set_tx_dig_gain = 0x400019f0; */
 /* rom_set_txcap_reg = 0x400019f4; */
 rom_set_txclk_en = 0x400019f8;
 rom_spur_cal = 0x400019fc;
 rom_spur_reg_write_one_tone = 0x40001a00;
 rom_target_power_add_backoff = 0x40001a04;
 rom_tx_pwctrl_bg_init = 0x40001a08;
-rom_txbbgain_to_index = 0x40001a0c;
+/* rom_txbbgain_to_index = 0x40001a0c; */
 rom_wifi_11g_rate_chg = 0x40001a10;
 rom_write_gain_mem = 0x40001a14;
 chip726_phyrom_version = 0x40001a18;
@@ -1931,4 +1931,4 @@ rom_write_pll_cap_mem = 0x40001b18;
 rom_pll_correct_dcap = 0x40001b1c;
 rom_phy_en_hw_set_freq = 0x40001b20;
 rom_phy_dis_hw_set_freq = 0x40001b24;
-rom_pll_vol_cal = 0x40001b28;
+/* rom_pll_vol_cal = 0x40001b28; */
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index c813b4b147..682a6588da 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit c813b4b14704132002d154298384c985c10a2b6d
+Subproject commit 682a6588dab0a18ef79630a0f3b59e551be35a43