alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/i2s_apll_disable_issue' into 'master'

Browse Source 
i2s: fix driver uninstall issue

Closes IDF-3129

See merge request espressif/esp-idf!13238
This commit is contained in:
Michael (XIAO Xufeng) 2021-05-31 08:16:21 +00:00
commit ff29aded19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/i2s.c
View File

@ -857,8 +857,6 @@ static esp_err_t i2s_param_config(i2s_port_t i2s_num, const i2s_config_t *i2s_co
I2S_CHECK((i2s_config), "param null", ESP_ERR_INVALID_ARG); I2S_CHECK((i2s_config), "param null", ESP_ERR_INVALID_ARG);
I2S_CHECK((i2s_check_cfg_static(i2s_num, i2s_config) == ESP_OK), "param check error", ESP_ERR_INVALID_ARG); I2S_CHECK((i2s_check_cfg_static(i2s_num, i2s_config) == ESP_OK), "param check error", ESP_ERR_INVALID_ARG);
periph_module_enable(i2s_periph_signal[i2s_num].module);
#if SOC_I2S_SUPPORTS_ADC_DAC #if SOC_I2S_SUPPORTS_ADC_DAC
if(i2s_config->mode & I2S_MODE_ADC_BUILT_IN) { if(i2s_config->mode & I2S_MODE_ADC_BUILT_IN) {
//in ADC built-in mode, we need to call i2s_set_adc_mode to //in ADC built-in mode, we need to call i2s_set_adc_mode to
@ -1015,6 +1013,8 @@ esp_err_t i2s_driver_uninstall(i2s_port_t i2s_num)
} }
if(p_i2s_obj[i2s_num]->use_apll) { if(p_i2s_obj[i2s_num]->use_apll) {
// switch back to PLL clock source
i2s_hal_set_clock_sel(&(p_i2s_obj[i2s_num]->hal), I2S_CLK_D2CLK);
rtc_clk_apll_enable(0, 0, 0, 0, 0); rtc_clk_apll_enable(0, 0, 0, 0, 0);
} }
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE