espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_adc_digital_not_reset_issue_v4.3' into 'release/v4.3'

Browse Source 
adc: fix adc digital not reset issue (v4.3)

See merge request espressif/esp-idf!17427
This commit is contained in:
morris
2022-04-22 12:43:44 +08:00
parent 1ad55d707b f8c098658c
commit a818e9ca91
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/esp32c3/adc.c
View File

@@ -229,8 +229,10 @@ esp_err_t adc_digi_initialize(const adc_digi_init_config_t *init_config)
}; };
adc_hal_context_config(&s_adc_digi_ctx->hal, &config); adc_hal_context_config(&s_adc_digi_ctx->hal, &config);
//enable SARADC module clock //enable ADC digital part
periph_module_enable(PERIPH_SARADC_MODULE); periph_module_enable(PERIPH_SARADC_MODULE);
//reset ADC digital part
periph_module_reset(PERIPH_SARADC_MODULE);
adc_hal_calibration_init(ADC_NUM_1); adc_hal_calibration_init(ADC_NUM_1);
adc_hal_calibration_init(ADC_NUM_2); adc_hal_calibration_init(ADC_NUM_2);

4
components/hal/esp32s2/include/hal/clk_gate_ll.h
View File

@@ -29,6 +29,8 @@ extern "C" {
static inline uint32_t periph_ll_get_clk_en_mask(periph_module_t periph) static inline uint32_t periph_ll_get_clk_en_mask(periph_module_t periph)
{ {
switch (periph) { switch (periph) {
case PERIPH_SARADC_MODULE:
return DPORT_APB_SARADC_CLK_EN;
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return DPORT_LEDC_CLK_EN; return DPORT_LEDC_CLK_EN;
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:
@@ -109,6 +111,8 @@ static inline uint32_t periph_ll_get_rst_en_mask(periph_module_t periph, bool en
(void)enable; // unused (void)enable; // unused
switch (periph) { switch (periph) {
case PERIPH_SARADC_MODULE:
return DPORT_APB_SARADC_RST;
case PERIPH_LEDC_MODULE: case PERIPH_LEDC_MODULE:
return DPORT_LEDC_RST; return DPORT_LEDC_RST;
case PERIPH_UART0_MODULE: case PERIPH_UART0_MODULE:

1
components/soc/esp32s2/include/soc/periph_defs.h
View File

@@ -55,6 +55,7 @@ typedef enum {
PERIPH_AES_DMA_MODULE, PERIPH_AES_DMA_MODULE,
PERIPH_SHA_DMA_MODULE, PERIPH_SHA_DMA_MODULE,
PERIPH_DEDIC_GPIO_MODULE, PERIPH_DEDIC_GPIO_MODULE,
PERIPH_SARADC_MODULE,
PERIPH_MODULE_MAX PERIPH_MODULE_MAX
} periph_module_t; } periph_module_t;