OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xtensa: Fix core voltage level when SPI Flash runs at 80Mhz 

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2022-01-14 11:43:42 -03:00 committed by Xiang Xiao
parent f61f276120
commit 04723a89f2
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/src/esp32/hardware/esp32_soc.h
View File

@ -620,7 +620,7 @@ extern int rom_i2c_writereg(int block, int block_id, int reg_add,
(REG_GET_FIELD(EFUSE_BLK0_RDATA5_REG, \ (REG_GET_FIELD(EFUSE_BLK0_RDATA5_REG, \
EFUSE_RD_VOL_LEVEL_HP_INV))) EFUSE_RD_VOL_LEVEL_HP_INV)))
#ifdef CONFIG_ESPTOOLPY_FLASHFREQ_80M #ifdef CONFIG_ESP32_FLASH_FREQ_80M
#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_HP_VOLT #define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_HP_VOLT
#else #else
#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V10 #define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V10

16
arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
View File

@ -521,24 +521,14 @@ extern void rom_i2c_writereg_mask(uint8_t block, uint8_t host_id,
/* Core voltage needs to be increased in two cases: /* Core voltage needs to be increased in two cases:
* 1. running at 240 MHz * 1. running at 240 MHz
* 2. running with 80MHz Flash frequency * 2. running with 80MHz Flash frequency
* There is a record in efuse which indicates the
* proper voltage for these two cases.
*/ */
#define RTC_CNTL_DBIAS_HP_VOLT (RTC_CNTL_DBIAS_1V25 - \ #ifdef CONFIG_ESP32S2_FLASH_FREQ_80M
(REG_GET_FIELD(EFUSE_BLK0_RDATA5_REG, \ #define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V25
EFUSE_RD_VOL_LEVEL_HP_INV)))
#ifdef CONFIG_ESPTOOLPY_FLASHFREQ_80M
#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_HP_VOLT
#else #else
#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V10 #define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V10
#endif #endif
#define DIG_DBIAS_240M RTC_CNTL_DBIAS_HP_VOLT #define DIG_DBIAS_240M RTC_CNTL_DBIAS_1V25
#define DIG_DBIAS_XTAL RTC_CNTL_DBIAS_1V10
#define DIG_DBIAS_2M RTC_CNTL_DBIAS_1V00
#define DIG_DBIAS_240M RTC_CNTL_DBIAS_HP_VOLT
#define DIG_DBIAS_XTAL RTC_CNTL_DBIAS_1V10 #define DIG_DBIAS_XTAL RTC_CNTL_DBIAS_1V10
#define DIG_DBIAS_2M RTC_CNTL_DBIAS_1V00 #define DIG_DBIAS_2M RTC_CNTL_DBIAS_1V00