Skip to content

Commit c7ee2d7

Browse files
committed
refactor(pmu): replace regi2c registers with LL APIs
1 parent d598c9d commit c7ee2d7

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

components/bootloader_support/src/bootloader_random_esp32c61.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void bootloader_random_enable(void)
2323
// enable analog i2c master clock for RNG runtime
2424
ANALOG_CLOCK_ENABLE();
2525

26-
adc_ll_regi2c_adc_prepare();
26+
adc_ll_regi2c_adc_init();
2727
adc_ll_set_calibration_param(ADC_UNIT_1, 0x866);
2828
adc_ll_set_calibration_param(ADC_UNIT_2, 0x866);
2929

@@ -49,7 +49,7 @@ void bootloader_random_disable(void)
4949
adc_ll_digi_reset_pattern_table();
5050
adc_ll_set_calibration_param(ADC_UNIT_1, 0x0);
5151
adc_ll_set_calibration_param(ADC_UNIT_2, 0x0);
52-
adc_ll_regi2c_adc_reset();
52+
adc_ll_regi2c_adc_deinit();
5353

5454
// disable analog i2c master clock
5555
ANALOG_CLOCK_DISABLE();

components/bootloader_support/src/bootloader_random_esp32h2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void bootloader_random_enable(void)
2222
// enable analog i2c master clock for RNG runtime
2323
ANALOG_CLOCK_ENABLE();
2424

25-
adc_ll_regi2c_adc_prepare(void);
25+
adc_ll_regi2c_adc_init();
2626
adc_ll_set_calibration_param(ADC_UNIT_1, 0x866);
2727
adc_ll_set_calibration_param(ADC_UNIT_2, 0x866);
2828

@@ -46,7 +46,7 @@ void bootloader_random_disable(void)
4646
adc_ll_digi_reset_pattern_table();
4747
adc_ll_set_calibration_param(ADC_UNIT_1, 0x0);
4848
adc_ll_set_calibration_param(ADC_UNIT_2, 0x0);
49-
adc_ll_regi2c_adc_reset();
49+
adc_ll_regi2c_adc_deinit();
5050

5151
// disable analog i2c master clock
5252
ANALOG_CLOCK_DISABLE();

components/esp_hw_support/port/esp32c61/pmu_init.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -12,6 +12,7 @@
1212
#include "soc/soc.h"
1313
#include "soc/pmu_struct.h"
1414
#include "hal/pmu_hal.h"
15+
#include "hal/regi2c_ctrl_ll.h"
1516
#include "pmu_param.h"
1617
#include "esp_private/esp_pmu.h"
1718
#include "soc/regi2c_dig_reg.h"
@@ -209,8 +210,8 @@ static void pmu_lp_system_init_default(pmu_context_t *ctx)
209210
void pmu_init(void)
210211
{
211212
/* Peripheral reg i2c power up */
212-
SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_PERIF_I2C_RSTB);
213-
SET_PERI_REG_MASK(PMU_RF_PWC_REG, PMU_XPD_PERIF_I2C);
213+
regi2c_ctrl_ll_i2c_reset_set();
214+
regi2c_ctrl_ll_i2c_periph_enable();
214215

215216
pmu_hp_system_init_default(PMU_instance());
216217
pmu_lp_system_init_default(PMU_instance());

components/hal/esp32c61/include/hal/adc_ll.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -693,9 +693,9 @@ static inline void adc_ll_enable_encal_ref(adc_unit_t adc_n, bool en)
693693

694694
__attribute__((always_inline))
695695
/**
696-
* Prepare regi2c SARADC registers
696+
* Init regi2c SARADC registers
697697
*/
698-
static inline void adc_ll_regi2c_adc_prepare(void)
698+
static inline void adc_ll_regi2c_adc_init(void)
699699
{
700700
adc_ll_set_dtest_param(0);
701701
adc_ll_set_ent_param(1);
@@ -705,10 +705,10 @@ static inline void adc_ll_regi2c_adc_prepare(void)
705705
}
706706

707707
/**
708-
* Reset regi2c SARADC registers
708+
* Deinit regi2c SARADC registers
709709
*/
710710
__attribute__((always_inline))
711-
static inline void adc_ll_regi2c_adc_reset(void)
711+
static inline void adc_ll_regi2c_adc_deinit(void)
712712
{
713713
adc_ll_set_dtest_param(0);
714714
adc_ll_set_ent_param(0);

components/hal/esp32h2/include/hal/adc_ll.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,21 +724,21 @@ static inline void adc_ll_enable_tout_bus(adc_unit_t adc_n, bool en)
724724
}
725725

726726
/**
727-
* Prepare regi2c SARADC registers
727+
* Init regi2c SARADC registers
728728
*/
729729
__attribute__((always_inline))
730-
static inline void adc_ll_regi2c_adc_prepare(void)
730+
static inline void adc_ll_regi2c_adc_init(void)
731731
{
732732
adc_ll_set_dtest_param(0);
733733
adc_ll_set_ent_param(1);
734734
adc_ll_enable_tout_bus(ADC_UNIT_1, true);
735735
}
736736

737737
/**
738-
* Reset regi2c SARADC registers
738+
* Deinit regi2c SARADC registers
739739
*/
740740
__attribute__((always_inline))
741-
static inline void adc_ll_regi2c_adc_reset(void)
741+
static inline void adc_ll_regi2c_adc_deinit(void)
742742
{
743743
adc_ll_set_dtest_param(0);
744744
adc_ll_set_ent_param(0);

0 commit comments

Comments
 (0)