From b70f41ca7a9511f692fc9393317d6b34b4ef157b Mon Sep 17 00:00:00 2001 From: wanckl Date: Fri, 16 Aug 2024 20:42:20 +0800 Subject: [PATCH] fix(gdma): fix c61 ahb dma for spi periph triggr number --- components/esp_hw_support/test_apps/.build-test-rules.yml | 3 --- components/esp_hw_support/test_apps/dma/README.md | 4 ++-- components/soc/esp32c61/include/soc/gdma_channel.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/esp_hw_support/test_apps/.build-test-rules.yml b/components/esp_hw_support/test_apps/.build-test-rules.yml index 75a3f94f99..b61d8878c6 100644 --- a/components/esp_hw_support/test_apps/.build-test-rules.yml +++ b/components/esp_hw_support/test_apps/.build-test-rules.yml @@ -5,9 +5,6 @@ components/esp_hw_support/test_apps/dma: - if: IDF_TARGET in ["esp32"] temporary: false reason: No general DMA controller on ESP32 - - if: IDF_TARGET in ["esp32c61"] - temporary: true - reason: not supported [ESP32C61] IDF-9310 depends_filepatterns: - components/esp_hw_support/dma/**/* diff --git a/components/esp_hw_support/test_apps/dma/README.md b/components/esp_hw_support/test_apps/dma/README.md index 3a9c73a780..cc9654f295 100644 --- a/components/esp_hw_support/test_apps/dma/README.md +++ b/components/esp_hw_support/test_apps/dma/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | diff --git a/components/soc/esp32c61/include/soc/gdma_channel.h b/components/soc/esp32c61/include/soc/gdma_channel.h index e1e6e87bd0..9c300d1150 100644 --- a/components/soc/esp32c61/include/soc/gdma_channel.h +++ b/components/soc/esp32c61/include/soc/gdma_channel.h @@ -8,7 +8,7 @@ // The following macros have a format SOC_[periph][instance_id] to make it work with `GDMA_MAKE_TRIGGER` #define SOC_GDMA_TRIG_PERIPH_M2M0 (-1) -#define SOC_GDMA_TRIG_PERIPH_SPI2 (0) +#define SOC_GDMA_TRIG_PERIPH_SPI2 (1) #define SOC_GDMA_TRIG_PERIPH_UHCI0 (2) #define SOC_GDMA_TRIG_PERIPH_I2S0 (3) #define SOC_GDMA_TRIG_PERIPH_SHA0 (7)