alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/reset_modem_lpcon_in_soft_reset' into 'master'

Browse Source 
bugfix: reset modem lpcon in soft reset

See merge request espressif/esp-idf!22347
This commit is contained in:
Wu Zheng Hui 2023-02-14 10:31:17 +08:00
commit d1b6ff6cca
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_system/port/soc/esp32c6/system_internal.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -20,6 +20,7 @@
#include "soc/uart_reg.h" #include "soc/uart_reg.h"
#include "hal/wdt_hal.h" #include "hal/wdt_hal.h"
#include "hal/modem_syscon_ll.h" #include "hal/modem_syscon_ll.h"
#include "hal/modem_lpcon_ll.h"
#include "esp_private/cache_err_int.h" #include "esp_private/cache_err_int.h"
#include "esp32c6/rom/cache.h" #include "esp32c6/rom/cache.h"
@ -72,6 +73,7 @@ void IRAM_ATTR esp_restart_noos(void)
// REG_WRITE(SYSTEM_CORE_RST_EN_REG, 0); // REG_WRITE(SYSTEM_CORE_RST_EN_REG, 0);
modem_syscon_ll_reset_all(&MODEM_SYSCON); modem_syscon_ll_reset_all(&MODEM_SYSCON);
modem_lpcon_ll_reset_all(&MODEM_LPCON);
// Set Peripheral clk rst // Set Peripheral clk rst
SET_PERI_REG_MASK(PCR_TIMERGROUP0_CONF_REG, PCR_TG0_RST_EN); SET_PERI_REG_MASK(PCR_TIMERGROUP0_CONF_REG, PCR_TG0_RST_EN);

9
components/hal/esp32c6/include/hal/modem_lpcon_ll.h
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -216,6 +216,13 @@ static inline void modem_lpcon_ll_set_lp_apb_icg_bitmap(modem_lpcon_dev_t *hw, u
hw->clk_conf_power_st.clk_lp_apb_st_map = bitmap; hw->clk_conf_power_st.clk_lp_apb_st_map = bitmap;
} }
__attribute__((always_inline))
static inline void modem_lpcon_ll_reset_all(modem_lpcon_dev_t *hw)
{
hw->rst_conf.val = 0xf;
hw->rst_conf.val = 0;
}
__attribute__((always_inline)) __attribute__((always_inline))
static inline uint32_t modem_lpcon_ll_get_date(modem_lpcon_dev_t *hw) static inline uint32_t modem_lpcon_ll_get_date(modem_lpcon_dev_t *hw)
{ {