Merge branch 'fix/fix_adc_cali_error_c5_v5.5_bp' into 'release/v5.5'

suda-morris · suda-morris · commit 3f8da22ae008 · 2025-06-13T19:10:16.000+08:00
fix(adc): fix adc calibration error on c5 (v5.5)

See merge request espressif/esp-idf!39857
diff --git a/components/efuse/esp32c5/esp_efuse_rtc_calib.c b/components/efuse/esp32c5/esp_efuse_rtc_calib.c
@@ -53,7 +53,7 @@ uint32_t esp_efuse_rtc_calib_get_init_code(int version, uint32_t adc_unit, int a
     uint32_t init_code = 0;
     ESP_ERROR_CHECK(esp_efuse_read_field_blob(init_code_efuse, &init_code, init_code_size));
 
-    return init_code + 1400;    // version 1 logic
+    return init_code + 1600;    // version 1 logic
 
 }
 
diff --git a/components/hal/esp32c5/include/hal/adc_ll.h b/components/hal/esp32c5/include/hal/adc_ll.h
@@ -810,7 +810,7 @@ static inline adc_atten_t adc_ll_get_atten(adc_unit_t adc_n, adc_channel_t chann
 __attribute__((always_inline))
 static inline void adc_ll_calibration_init(adc_unit_t adc_n)
 {
-    REGI2C_WRITE_MASK(I2C_SAR_ADC, ADC_SAR1_DREF_ADDR, 4);
+    REGI2C_WRITE_MASK(I2C_SAR_ADC, ADC_SAR1_DREF_ADDR, 1);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ uint32_t esp_efuse_rtc_calib_get_init_code(int version, uint32_t adc_unit, int a`
`53`	`53`	`uint32_t init_code = 0;`
`54`	`54`	`ESP_ERROR_CHECK(esp_efuse_read_field_blob(init_code_efuse, &init_code, init_code_size));`
`55`	`55`
`56`		`- return init_code + 1400; // version 1 logic`
	`56`	`+ return init_code + 1600; // version 1 logic`
`57`	`57`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ static inline adc_atten_t adc_ll_get_atten(adc_unit_t adc_n, adc_channel_t chann`
`810`	`810`	`__attribute__((always_inline))`
`811`	`811`	`static inline void adc_ll_calibration_init(adc_unit_t adc_n)`
`812`	`812`	`{`
`813`		`- REGI2C_WRITE_MASK(I2C_SAR_ADC, ADC_SAR1_DREF_ADDR, 4);`
	`813`	`+ REGI2C_WRITE_MASK(I2C_SAR_ADC, ADC_SAR1_DREF_ADDR, 1);`
`814`	`814`	`}`
`815`	`815`
`816`	`816`	`/**`