michaelh/zephyr
1
0
Fork 0
Code Releases Activity

west.yml: update hal_espressif to latest version

Browse source 
- Update GDMA and ADC drivers and remove deprecated entries.
- Rebased hal_espressif to latest bump sync.
- Added ESP Timer and Radio common config values

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
This commit is contained in:
Sylvio Alves 2024-09-29 18:51:09 -03:00 • committed by Mahesh Mahadevan
commit a70741bc82
5 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/adc/adc_esp32.c
View file

@ -41,7 +41,7 @@ LOG_MODULE_REGISTER(adc_esp32, CONFIG_ADC_LOG_LEVEL);
* clip the value instead of yet another correction. The IDF implementation
* for ESP32-S2 is doing it, so we copy that approach in Zephyr driver
*/
#define ADC_CLIP_MVOLT_11DB 2550
#define ADC_CLIP_MVOLT_12DB 2550
#elif CONFIG_SOC_SERIES_ESP32S3
#define ADC_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP_FIT
#else
@ -95,7 +95,7 @@ static inline int gain_to_atten(enum adc_gain gain, adc_atten_t *atten)
*atten = ADC_ATTEN_DB_6;
break;
case ADC_GAIN_1_4:
*atten = ADC_ATTEN_DB_11;
*atten = ADC_ATTEN_DB_12;
break;
default:
return -ENOTSUP;
@ -117,7 +117,7 @@ static void atten_to_gain(adc_atten_t atten, uint32_t *val_mv)
case ADC_ATTEN_DB_6:
*val_mv = *val_mv >> 1; /* 1/ADC_GAIN_1_2 */
break;
case ADC_ATTEN_DB_11:
case ADC_ATTEN_DB_12:
*val_mv = *val_mv / 4; /* 1/ADC_GAIN_1_4 */
break;
case ADC_ATTEN_DB_0: /* 1/ADC_GAIN_1 */
@ -458,9 +458,9 @@ static int adc_esp32_read(const struct device *dev, const struct adc_sequence *s
cal = cal_mv = esp_adc_cal_raw_to_voltage(reading, &data->chars[channel_id]);
#if CONFIG_SOC_SERIES_ESP32
if (data->attenuation[channel_id] == ADC_ATTEN_DB_11) {
if (cal > ADC_CLIP_MVOLT_11DB) {
cal = ADC_CLIP_MVOLT_11DB;
if (data->attenuation[channel_id] == ADC_ATTEN_DB_12) {
if (cal > ADC_CLIP_MVOLT_12DB) {
cal = ADC_CLIP_MVOLT_12DB;
}
}
#endif /* CONFIG_SOC_SERIES_ESP32 */

4
drivers/dma/dma_esp32_gdma.c
View file

@ -33,11 +33,7 @@ LOG_MODULE_REGISTER(dma_esp32_gdma, CONFIG_DMA_LOG_LEVEL);
#define ISR_HANDLER intr_handler_t
#endif
#if defined(CONFIG_SOC_SERIES_ESP32C6)
#define DMA_MAX_CHANNEL SOC_GDMA_PAIRS_PER_GROUP_MAX
#else
#define DMA_MAX_CHANNEL SOC_GDMA_PAIRS_PER_GROUP
#endif
#define ESP_DMA_M2M_ON 0
#define ESP_DMA_M2M_OFF 1

27
soc/espressif/common/Kconfig
View file

@ -32,7 +32,32 @@ config ESP_HEAP_RUNTIME
ending by a last memory location that can be safely accesed (depending on a boot mode).
This is a memory pool used in runtime to create a new heap memory.
config ESP32_TIMER_TASK_STACK_SIZE
int "Stack size of the high resolution ESP Timer"
default 4096
help
Set the stack size for the internal high resolution ESP Timer
used in Wi-Fi and BLE peripherals.
config ESP32_TIMER_TASK_PRIO
int "Task priority of the high resolution ESP Timer"
default 3
help
Set the task priority for the internal high resolution ESP Timer
used in Wi-Fi and BLE peripherals.
if (BT_ESP32 || WIFI_ESP32)
config ESP32_PHY_MAX_TX_POWER
int "Max Wi-Fi/BLE TX power (dBm)"
range 10 20
default 20
help
Set maximum transmit power for Wi-Fi radio. Actual transmit power for high
data rates may be lower than this setting.
endif
rsource "Kconfig.spiram"
rsource "Kconfig.esptool"
rsource "Kconfig.flash"
rsource "Kconfig.wifi"

2
soc/espressif/common/Kconfig.esptool
View file

@ -114,7 +114,7 @@ endchoice # ESPTOOLPY_FLASHFREQ
config ESPTOOLPY_FLASHFREQ_80M_DEFAULT
bool
default y if SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
default y if SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6
help
This is an invisible item, used to define the targets that defaults to use 80MHz Flash SPI speed.

2
west.yml
View file

@ -157,7 +157,7 @@ manifest:
groups:
- hal
- name: hal_espressif
revision: 09676fc39bde2c38d6cd40912875cf78ee76126e
revision: 0f1874284f5dee0d49cb23f44f756e7be404e7b7
path: modules/hal/espressif
west-commands: west/west-commands.yml
groups: