Skip to content

Commit e21e3f4

Browse files
committed
Merge branch 'fix/adc_func_register_not_reset_issue' into 'master'
adc: func register not reset issue Closes IDF-12489 See merge request espressif/esp-idf!37001
2 parents 9f489c2 + 78e6ce0 commit e21e3f4

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

components/hal/esp32c5/include/hal/adc_ll.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
580580
*/
581581
static inline void adc_ll_reset_register(void)
582582
{
583+
PCR.saradc_conf.saradc_rst_en = 1;
584+
PCR.saradc_conf.saradc_rst_en = 0;
583585
PCR.saradc_conf.saradc_reg_rst_en = 1;
584586
PCR.saradc_conf.saradc_reg_rst_en = 0;
585587
}

components/hal/esp32c6/include/hal/adc_ll.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
579579
*/
580580
static inline void adc_ll_reset_register(void)
581581
{
582+
PCR.saradc_conf.saradc_rst_en = 1;
583+
PCR.saradc_conf.saradc_rst_en = 0;
582584
PCR.saradc_conf.saradc_reg_rst_en = 1;
583585
PCR.saradc_conf.saradc_reg_rst_en = 0;
584586
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
582582
*/
583583
static inline void adc_ll_reset_register(void)
584584
{
585+
PCR.saradc_conf.saradc_rst_en = 1;
586+
PCR.saradc_conf.saradc_rst_en = 0;
585587
PCR.saradc_conf.saradc_reg_rst_en = 1;
586588
PCR.saradc_conf.saradc_reg_rst_en = 0;
587589
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
589589
*/
590590
static inline void adc_ll_reset_register(void)
591591
{
592+
PCR.saradc_conf.saradc_rst_en = 1;
593+
PCR.saradc_conf.saradc_rst_en = 0;
592594
PCR.saradc_conf.saradc_reg_rst_en = 1;
593595
PCR.saradc_conf.saradc_reg_rst_en = 0;
594596
}

0 commit comments

Comments
 (0)