Explorar el Código

Merge branch 'bugfix/fix_bt_sleep_hangs_when_enable_light_sleep' into 'master'

bt: fix bt sleep flow hangs in btdm_sleep_clock_sync

Closes BT-2990

See merge request espressif/esp-idf!21311
Jiang Jiang Jian hace 3 años
padre
commit
236a5301a0

+ 1 - 2
components/soc/esp32/include/soc/dport_reg.h

@@ -1082,8 +1082,7 @@
                                      DPORT_WIFIMAC_RST      | \
                                      DPORT_BTBB_RST         | \
                                      DPORT_BTMAC_RST        | \
-                                     DPORT_RW_BTMAC_RST     | \
-                                     DPORT_RW_BTLP_RST)
+                                     DPORT_RW_BTMAC_RST)
 
 #define DPORT_BT_LPCK_DIV_INT_REG          (DR_REG_DPORT_BASE + 0x0D4)
 /* DPORT_BTEXTWAKEUP_REQ : R/W ;bitpos:[12] ;default: 1'b0 ; */

+ 0 - 2
components/soc/esp32c3/include/soc/syscon_reg.h

@@ -216,9 +216,7 @@ extern "C" {
                                      SYSTEM_BTBB_RST         | \
                                      SYSTEM_BTMAC_RST        | \
                                      SYSTEM_RW_BTMAC_RST     | \
-                                     SYSTEM_RW_BTLP_RST      | \
                                      SYSTEM_RW_BTMAC_REG_RST | \
-                                     SYSTEM_RW_BTLP_REG_RST  | \
                                      SYSTEM_BTBB_REG_RST)
 
 #define SYSCON_HOST_INF_SEL_REG          (DR_REG_SYSCON_BASE + 0x01C)

+ 1 - 2
components/soc/esp32s2/include/soc/syscon_reg.h

@@ -485,8 +485,7 @@ extern "C" {
                                      DPORT_WIFIMAC_RST      | \
                                      DPORT_BTBB_RST         | \
                                      DPORT_BTMAC_RST        | \
-                                     DPORT_RW_BTMAC_RST     | \
-                                     DPORT_RW_BTLP_RST)
+                                     DPORT_RW_BTMAC_RST)
 
 #define SYSCON_FRONT_END_MEM_PD_REG          (DR_REG_SYSCON_BASE + 0x098)
 /* SYSCON_DC_MEM_FORCE_PD : R/W ;bitpos:[5] ;default: 1'b0 ; */

+ 0 - 2
components/soc/esp32s3/include/soc/syscon_reg.h

@@ -220,9 +220,7 @@ extern "C" {
                                      SYSTEM_BTBB_RST         | \
                                      SYSTEM_BTMAC_RST        | \
                                      SYSTEM_RW_BTMAC_RST     | \
-                                     SYSTEM_RW_BTLP_RST      | \
                                      SYSTEM_RW_BTMAC_REG_RST | \
-                                     SYSTEM_RW_BTLP_REG_RST  | \
                                      SYSTEM_BTBB_REG_RST)
 
 #define SYSCON_HOST_INF_SEL_REG          (DR_REG_SYSCON_BASE + 0x1C)