Merge branch 'fix/adc_func_register_not_reset_issue_v5.4' into 'release/v5.4'

suda-morris · suda-morris · commit 15e75f21a766 · 2025-02-19T10:02:29.000+08:00
adc: func register not reset issue (v5.4)

See merge request espressif/esp-idf!37045
diff --git a/components/hal/esp32c5/include/hal/adc_ll.h b/components/hal/esp32c5/include/hal/adc_ll.h
@@ -582,6 +582,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
  */
 static inline void adc_ll_reset_register(void)
 {
+    PCR.saradc_conf.saradc_rst_en = 1;
+    PCR.saradc_conf.saradc_rst_en = 0;
     PCR.saradc_conf.saradc_reg_rst_en = 1;
     PCR.saradc_conf.saradc_reg_rst_en = 0;
 }
diff --git a/components/hal/esp32c6/include/hal/adc_ll.h b/components/hal/esp32c6/include/hal/adc_ll.h
@@ -581,6 +581,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
  */
 static inline void adc_ll_reset_register(void)
 {
+    PCR.saradc_conf.saradc_rst_en = 1;
+    PCR.saradc_conf.saradc_rst_en = 0;
     PCR.saradc_conf.saradc_reg_rst_en = 1;
     PCR.saradc_conf.saradc_reg_rst_en = 0;
 }
diff --git a/components/hal/esp32h2/include/hal/adc_ll.h b/components/hal/esp32h2/include/hal/adc_ll.h
@@ -582,6 +582,8 @@ static inline void adc_ll_enable_func_clock(bool enable)
  */
 static inline void adc_ll_reset_register(void)
 {
+    PCR.saradc_conf.saradc_rst_en = 1;
+    PCR.saradc_conf.saradc_rst_en = 0;
     PCR.saradc_conf.saradc_reg_rst_en = 1;
     PCR.saradc_conf.saradc_reg_rst_en = 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,8 @@ static inline void adc_ll_enable_func_clock(bool enable)`
`582`	`582`	`*/`
`583`	`583`	`static inline void adc_ll_reset_register(void)`
`584`	`584`	`{`
	`585`	`+ PCR.saradc_conf.saradc_rst_en = 1;`
	`586`	`+ PCR.saradc_conf.saradc_rst_en = 0;`
`585`	`587`	`PCR.saradc_conf.saradc_reg_rst_en = 1;`
`586`	`588`	`PCR.saradc_conf.saradc_reg_rst_en = 0;`
`587`	`589`	`}`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,8 @@ static inline void adc_ll_enable_func_clock(bool enable)`
`581`	`581`	`*/`
`582`	`582`	`static inline void adc_ll_reset_register(void)`
`583`	`583`	`{`
	`584`	`+ PCR.saradc_conf.saradc_rst_en = 1;`
	`585`	`+ PCR.saradc_conf.saradc_rst_en = 0;`
`584`	`586`	`PCR.saradc_conf.saradc_reg_rst_en = 1;`
`585`	`587`	`PCR.saradc_conf.saradc_reg_rst_en = 0;`
`586`	`588`	`}`