Merge branch 'bugfix/fix_s3_adc1_wrong_clk_div_v4.4' into 'release/v4.4'

fix(adc): fixed esp32, esp32s2,esp32s3 adc oneshot mode clk div issue (v4.4) See merge request espressif/esp-idf!24745
espressif · Jul 13, 2023 · 703e116 · 703e116
2 parents 330f8cb + 8bf4cb3
commit 703e116
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/components/hal/esp32/include/hal/adc_hal_conf.h b/components/hal/esp32/include/hal/adc_hal_conf.h
@@ -26,6 +26,6 @@
 
 #define SOC_ADC_PWDET_CCT_DEFAULT           (4)
 
-#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (2)
+#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
 
 #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT    (16)
diff --git a/components/hal/esp32c3/include/hal/adc_hal_conf.h b/components/hal/esp32c3/include/hal/adc_hal_conf.h
@@ -26,6 +26,4 @@
 
 #define SOC_ADC_PWDET_CCT_DEFAULT           (4)
 
-#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
-
 #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT     (1)
diff --git a/components/hal/esp32h2/include/hal/adc_hal_conf.h b/components/hal/esp32h2/include/hal/adc_hal_conf.h
@@ -26,6 +26,4 @@
 
 #define SOC_ADC_PWDET_CCT_DEFAULT           (4)
 
-#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
-
 #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT     (1)
diff --git a/components/hal/esp32s2/include/hal/adc_hal_conf.h b/components/hal/esp32s2/include/hal/adc_hal_conf.h
@@ -26,6 +26,6 @@
 
 #define SOC_ADC_PWDET_CCT_DEFAULT           (4)
 
-#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
+#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
 
 #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT    (2)
diff --git a/components/hal/esp32s3/include/hal/adc_hal_conf.h b/components/hal/esp32s3/include/hal/adc_hal_conf.h
@@ -26,6 +26,6 @@
 
 #define SOC_ADC_PWDET_CCT_DEFAULT           (4)
 
-#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) ((PERIPH_NUM==0)? 2 : 1)
+#define SOC_ADC_SAR_CLK_DIV_DEFAULT(PERIPH_NUM) (1)
 
 #define SOC_ADC_DIGI_SAR_CLK_DIV_DEFAULT     (1)