feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_adc_single_with_pm_lock_build_bug' into 'master'

Browse Source 
adc: make adc single api only build pm lock on s2

See merge request espressif/esp-idf!14567
This commit is contained in:
Armando (Dou Yiwen)
2021-07-31 05:32:34 +00:00
parent 9506819df0 23eb723daf
commit ed741a5d96
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/adc_common.c
View File

@@ -530,7 +530,7 @@ esp_err_t adc2_config_channel_atten(adc2_channel_t channel, adc_atten_t atten)
static inline void adc2_init(void) static inline void adc2_init(void)
{ {
#if !CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32S2
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
/* Lock APB clock. */ /* Lock APB clock. */
if (s_adc2_arbiter_lock == NULL) { if (s_adc2_arbiter_lock == NULL) {
@@ -609,7 +609,7 @@ esp_err_t adc2_get_raw(adc2_channel_t channel, adc_bits_width_t width_bit, int *
adc_hal_set_controller(ADC_NUM_2, ADC_CTRL_RTC); adc_hal_set_controller(ADC_NUM_2, ADC_CTRL_RTC);
#endif #endif
#if !CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32S2
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
if (s_adc2_arbiter_lock) { if (s_adc2_arbiter_lock) {
esp_pm_lock_acquire(s_adc2_arbiter_lock); esp_pm_lock_acquire(s_adc2_arbiter_lock);