diff --git a/components/bootloader_support/src/bootloader_random_esp32c61.c b/components/bootloader_support/src/bootloader_random_esp32c61.c index 94a63e294a..5c9e60b21a 100644 --- a/components/bootloader_support/src/bootloader_random_esp32c61.c +++ b/components/bootloader_support/src/bootloader_random_esp32c61.c @@ -23,7 +23,7 @@ void bootloader_random_enable(void) // enable analog i2c master clock for RNG runtime 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_2, 0x866); @@ -49,7 +49,7 @@ void bootloader_random_disable(void) adc_ll_digi_reset_pattern_table(); adc_ll_set_calibration_param(ADC_UNIT_1, 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 ANALOG_CLOCK_DISABLE(); diff --git a/components/bootloader_support/src/bootloader_random_esp32h2.c b/components/bootloader_support/src/bootloader_random_esp32h2.c index 4e2a2db6a4..337298e607 100644 --- a/components/bootloader_support/src/bootloader_random_esp32h2.c +++ b/components/bootloader_support/src/bootloader_random_esp32h2.c @@ -22,7 +22,7 @@ void bootloader_random_enable(void) // enable analog i2c master clock for RNG runtime 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_2, 0x866); @@ -46,7 +46,7 @@ void bootloader_random_disable(void) adc_ll_digi_reset_pattern_table(); adc_ll_set_calibration_param(ADC_UNIT_1, 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 ANALOG_CLOCK_DISABLE(); diff --git a/components/esp_hw_support/port/esp32c61/pmu_init.c b/components/esp_hw_support/port/esp32c61/pmu_init.c index 1496d39190..abba30b8ec 100644 --- a/components/esp_hw_support/port/esp32c61/pmu_init.c +++ b/components/esp_hw_support/port/esp32c61/pmu_init.c @@ -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 */ @@ -12,6 +12,7 @@ #include "soc/soc.h" #include "soc/pmu_struct.h" #include "hal/pmu_hal.h" +#include "hal/regi2c_ctrl_ll.h" #include "pmu_param.h" #include "esp_private/esp_pmu.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) { /* Peripheral reg i2c power up */ - SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_PERIF_I2C_RSTB); - SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_XPD_PERIF_I2C); + regi2c_ctrl_ll_i2c_reset_set(); + regi2c_ctrl_ll_i2c_periph_enable(); pmu_hp_system_init_default(PMU_instance()); pmu_lp_system_init_default(PMU_instance()); diff --git a/components/hal/esp32c61/include/hal/adc_ll.h b/components/hal/esp32c61/include/hal/adc_ll.h index ba99f25813..a0f2b17f4b 100644 --- a/components/hal/esp32c61/include/hal/adc_ll.h +++ b/components/hal/esp32c61/include/hal/adc_ll.h @@ -693,9 +693,9 @@ static inline void adc_ll_enable_encal_ref(adc_unit_t adc_n, bool en) __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_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)) -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_ent_param(0); diff --git a/components/hal/esp32h2/include/hal/adc_ll.h b/components/hal/esp32h2/include/hal/adc_ll.h index a55c037d71..96d0eea7cb 100644 --- a/components/hal/esp32h2/include/hal/adc_ll.h +++ b/components/hal/esp32h2/include/hal/adc_ll.h @@ -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)) -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_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)) -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_ent_param(0);