blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

refactor(pmu): replace regi2c registers with LL APIs

Browse Source
This commit is contained in:
Armando 2025-02-17 15:39:17 +08:00 committed by armando
parent d598c9db7c
commit c7ee2d7157
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bootloader_support/src/bootloader_random_esp32c61.c
View File

@ -23,7 +23,7 @@ void bootloader_random_enable(void)
// enable analog i2c master clock for RNG runtime // enable analog i2c master clock for RNG runtime
ANALOG_CLOCK_ENABLE(); ANALOG_CLOCK_ENABLE();
adc_ll_regi2c_adc_prepare(); adc_ll_regi2c_adc_init();
adc_ll_set_calibration_param(ADC_UNIT_1, 0x866); adc_ll_set_calibration_param(ADC_UNIT_1, 0x866);
adc_ll_set_calibration_param(ADC_UNIT_2, 0x866); adc_ll_set_calibration_param(ADC_UNIT_2, 0x866);
@ -49,7 +49,7 @@ void bootloader_random_disable(void)
adc_ll_digi_reset_pattern_table(); adc_ll_digi_reset_pattern_table();
adc_ll_set_calibration_param(ADC_UNIT_1, 0x0); adc_ll_set_calibration_param(ADC_UNIT_1, 0x0);
adc_ll_set_calibration_param(ADC_UNIT_2, 0x0); adc_ll_set_calibration_param(ADC_UNIT_2, 0x0);
adc_ll_regi2c_adc_reset(); adc_ll_regi2c_adc_deinit();
// disable analog i2c master clock // disable analog i2c master clock
ANALOG_CLOCK_DISABLE(); ANALOG_CLOCK_DISABLE();

4
components/bootloader_support/src/bootloader_random_esp32h2.c
View File

@ -22,7 +22,7 @@ void bootloader_random_enable(void)
// enable analog i2c master clock for RNG runtime // enable analog i2c master clock for RNG runtime
ANALOG_CLOCK_ENABLE(); ANALOG_CLOCK_ENABLE();
adc_ll_regi2c_adc_prepare(void); adc_ll_regi2c_adc_init();
adc_ll_set_calibration_param(ADC_UNIT_1, 0x866); adc_ll_set_calibration_param(ADC_UNIT_1, 0x866);
adc_ll_set_calibration_param(ADC_UNIT_2, 0x866); adc_ll_set_calibration_param(ADC_UNIT_2, 0x866);
@ -46,7 +46,7 @@ void bootloader_random_disable(void)
adc_ll_digi_reset_pattern_table(); adc_ll_digi_reset_pattern_table();
adc_ll_set_calibration_param(ADC_UNIT_1, 0x0); adc_ll_set_calibration_param(ADC_UNIT_1, 0x0);
adc_ll_set_calibration_param(ADC_UNIT_2, 0x0); adc_ll_set_calibration_param(ADC_UNIT_2, 0x0);
adc_ll_regi2c_adc_reset(); adc_ll_regi2c_adc_deinit();
// disable analog i2c master clock // disable analog i2c master clock
ANALOG_CLOCK_DISABLE(); ANALOG_CLOCK_DISABLE();

7
components/esp_hw_support/port/esp32c61/pmu_init.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -12,6 +12,7 @@
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/pmu_struct.h" #include "soc/pmu_struct.h"
#include "hal/pmu_hal.h" #include "hal/pmu_hal.h"
#include "hal/regi2c_ctrl_ll.h"
#include "pmu_param.h" #include "pmu_param.h"
#include "esp_private/esp_pmu.h" #include "esp_private/esp_pmu.h"
#include "soc/regi2c_dig_reg.h" #include "soc/regi2c_dig_reg.h"
@ -209,8 +210,8 @@ static void pmu_lp_system_init_default(pmu_context_t *ctx)
void pmu_init(void) void pmu_init(void)
{ {
/* Peripheral reg i2c power up */ /* Peripheral reg i2c power up */
SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_PERIF_I2C_RSTB); regi2c_ctrl_ll_i2c_reset_set();
SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_XPD_PERIF_I2C); regi2c_ctrl_ll_i2c_periph_enable();
pmu_hp_system_init_default(PMU_instance()); pmu_hp_system_init_default(PMU_instance());
pmu_lp_system_init_default(PMU_instance()); pmu_lp_system_init_default(PMU_instance());

8
components/hal/esp32c61/include/hal/adc_ll.h
View File

@ -693,9 +693,9 @@ static inline void adc_ll_enable_encal_ref(adc_unit_t adc_n, bool en)
__attribute__((always_inline)) __attribute__((always_inline))
/** /**
* Prepare regi2c SARADC registers * Init regi2c SARADC registers
*/ */
static inline void adc_ll_regi2c_adc_prepare(void) static inline void adc_ll_regi2c_adc_init(void)
{ {
adc_ll_set_dtest_param(0); adc_ll_set_dtest_param(0);
adc_ll_set_ent_param(1); adc_ll_set_ent_param(1);
@ -705,10 +705,10 @@ static inline void adc_ll_regi2c_adc_prepare(void)
} }
/** /**
* Reset regi2c SARADC registers * Deinit regi2c SARADC registers
*/ */
__attribute__((always_inline)) __attribute__((always_inline))
static inline void adc_ll_regi2c_adc_reset(void) static inline void adc_ll_regi2c_adc_deinit(void)
{ {
adc_ll_set_dtest_param(0); adc_ll_set_dtest_param(0);
adc_ll_set_ent_param(0); adc_ll_set_ent_param(0);

8
components/hal/esp32h2/include/hal/adc_ll.h
View File

@ -724,10 +724,10 @@ static inline void adc_ll_enable_tout_bus(adc_unit_t adc_n, bool en)
} }
/** /**
* Prepare regi2c SARADC registers * Init regi2c SARADC registers
*/ */
__attribute__((always_inline)) __attribute__((always_inline))
static inline void adc_ll_regi2c_adc_prepare(void) static inline void adc_ll_regi2c_adc_init(void)
{ {
adc_ll_set_dtest_param(0); adc_ll_set_dtest_param(0);
adc_ll_set_ent_param(1); adc_ll_set_ent_param(1);
@ -735,10 +735,10 @@ static inline void adc_ll_regi2c_adc_prepare(void)
} }
/** /**
* Reset regi2c SARADC registers * Deinit regi2c SARADC registers
*/ */
__attribute__((always_inline)) __attribute__((always_inline))
static inline void adc_ll_regi2c_adc_reset(void) static inline void adc_ll_regi2c_adc_deinit(void)
{ {
adc_ll_set_dtest_param(0); adc_ll_set_dtest_param(0);
adc_ll_set_ent_param(0); adc_ll_set_ent_param(0);