espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_adc_cali_workround_wrong_range_v5.1' into 'release/v5.1'

Browse Source 
fix(regi2c): wrong ADC_CALI_PD_WORKAROUND on c6, h2 (v5.1)

See merge request espressif/esp-idf!24747
This commit is contained in:
morris
2023-07-13 14:17:27 +08:00
parent adc2bf1e93 6acc155516
commit cfa70abe0e
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_hw_support/regi2c_ctrl.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -79,7 +79,7 @@ void IRAM_ATTR regi2c_analog_cali_reg_write(void)
regi2c_ctrl_write_reg(I2C_SAR_ADC, I2C_SAR_ADC_HOSTID, i, reg_val[i]); regi2c_ctrl_write_reg(I2C_SAR_ADC, I2C_SAR_ADC_HOSTID, i, reg_val[i]);
} }
} }
#endif //#if ADC_CALI_PD_WORKAROUND
/** /**
* REGI2C_SARADC reference count * REGI2C_SARADC reference count
@ -109,6 +109,3 @@ void regi2c_saradc_disable(void)
regi2c_exit_critical(); regi2c_exit_critical();
} }
#endif //#if ADC_CALI_PD_WORKAROUND

10
components/soc/esp32c6/include/soc/regi2c_defs.h
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -27,11 +27,3 @@
#define ANA_CONFIG2_M BIT(18) #define ANA_CONFIG2_M BIT(18)
#define ANA_I2C_SAR_FORCE_PU BIT(16) #define ANA_I2C_SAR_FORCE_PU BIT(16)
/**
* Restore regi2c analog calibration related configuration registers.
* This is a workaround, and is fixed on later chips
*/
#define REGI2C_ANA_CALI_PD_WORKAROUND 1
#define REGI2C_ANA_CALI_BYTE_NUM 8

7
components/soc/esp32h2/include/soc/regi2c_defs.h
View File

@ -26,10 +26,3 @@
#define ANA_CONFIG2_M BIT(18) #define ANA_CONFIG2_M BIT(18)
#define ANA_I2C_SAR_FORCE_PU BIT(16) #define ANA_I2C_SAR_FORCE_PU BIT(16)
/**
* Restore regi2c analog calibration related configuration registers.
* This is a workaround, and is fixed on later chips
*/
#define REGI2C_ANA_CALI_PD_WORKAROUND 1
#define REGI2C_ANA_CALI_BYTE_NUM 8