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

esp_phy: Update ESP32S2 phy lib to support eco1 chip

Browse Source
This commit is contained in:
chenjianxing 2022-01-10 14:20:30 +08:00
parent fcce82ea53
commit 10c604475d
6 changed files with 92 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bootloader_support/src/bootloader_efuse_esp32s2.c
View File

@ -15,10 +15,10 @@
#include "sdkconfig.h" #include "sdkconfig.h"
#include "bootloader_clock.h" #include "bootloader_clock.h"
#include "bootloader_common.h" #include "bootloader_common.h"
#include "soc/efuse_reg.h"
uint8_t bootloader_common_get_chip_revision(void) uint8_t bootloader_common_get_chip_revision(void)
{ {
// should return the same value as esp_efuse_get_chip_ver() // should return the same value as esp_efuse_get_chip_ver()
/* No other revisions for ESP32-S2 */ return REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_WAFER_VERSION);
return 0;
} }

2
components/efuse/src/esp32s2/esp_efuse_fields.c
View File

@ -34,7 +34,7 @@ uint8_t esp_efuse_get_chip_ver(void)
{ {
// should return the same value as bootloader_common_get_chip_revision() // should return the same value as bootloader_common_get_chip_revision()
uint32_t chip_ver = 0; uint32_t chip_ver = 0;
// TODO: ESP32S2 does not have this field esp_efuse_read_field_blob(ESP_EFUSE_WAFER_VERSION, &chip_ver, ESP_EFUSE_WAFER_VERSION[0]->bit_count);
return chip_ver; return chip_ver;
} }

131
components/esp_wifi/esp32s2/include/phy_init_data.h
View File

@ -44,64 +44,76 @@ static const char phy_init_magic_pre[] = PHY_INIT_MAGIC;
* @brief Structure containing default recommended PHY initialization parameters. * @brief Structure containing default recommended PHY initialization parameters.
*/ */
static const esp_phy_init_data_t phy_init_data= { { static const esp_phy_init_data_t phy_init_data= { {
3, 0x80,
0, 0x00,
0x04, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4E),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4E),
0x04, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x04, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x42),
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0xff,
0x05, 0xff,
0x09, 0xff,
0x06, 0xff,
0x05, 0xff,
0x03, 0xff,
0x06, 0xff,
0x05, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0xf4, 0xff,
0xf8, 0xff,
0xf8, 0xff,
0xf0, 0xff,
0xf0, 0xff,
0xf0, 0xff,
0xe0, 0xff,
0xe0, 0xff,
0xe0, 0xff,
0x18, 0xff,
0x18, 0xff,
0x18, 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 78), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 72), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 66), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 60), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 56), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52), 0xff,
0, 0xff,
1, 0xff,
1, 0xff,
2, 0xff,
2, 0xff,
3, 0xff,
4, 0xff,
5, 0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0, 0,
0, 0,
0, 0,
@ -151,6 +163,15 @@ static const esp_phy_init_data_t phy_init_data= { {
0, 0,
0, 0,
0, 0,
0,
0,
0,
0,
0,
0,
0,
0,
0xf1
} }; } };
static const char phy_init_magic_post[] = PHY_INIT_MAGIC; static const char phy_init_magic_post[] = PHY_INIT_MAGIC;

7
components/esp_wifi/include/phy.h
View File

@ -81,6 +81,13 @@ void phy_close_rf(void);
*/ */
uint8_t phy_dig_reg_backup(bool backup_en, uint32_t *mem_addr); uint8_t phy_dig_reg_backup(bool backup_en, uint32_t *mem_addr);
#if CONFIG_IDF_TARGET_ESP32S2
/**
* @brief Phy version select for ESP32S2
*/
void phy_eco_version_sel(uint8_t chip_ver);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit a59d0ed9d872255e04e44fd47595fb1a2495e4e1 Subproject commit 88afe19a1e1be3c56ebef0e2fb21bcdc2090ff2d

5
components/esp_wifi/src/phy_init.c
View File

@ -26,6 +26,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "nvs.h" #include "nvs.h"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "esp_efuse.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
@ -768,6 +769,10 @@ void esp_phy_load_cal_and_init(phy_rf_module_t module)
char * phy_version = get_phy_version_str(); char * phy_version = get_phy_version_str();
ESP_LOGI(TAG, "phy_version %s", phy_version); ESP_LOGI(TAG, "phy_version %s", phy_version);
#if CONFIG_IDF_TARGET_ESP32S2
phy_eco_version_sel(esp_efuse_get_chip_ver());
#endif
esp_phy_calibration_data_t* cal_data = esp_phy_calibration_data_t* cal_data =
(esp_phy_calibration_data_t*) calloc(sizeof(esp_phy_calibration_data_t), 1); (esp_phy_calibration_data_t*) calloc(sizeof(esp_phy_calibration_data_t), 1);
if (cal_data == NULL) { if (cal_data == NULL) {