From b893744fd18adf64fbf38efe19253d2172cdfd46 Mon Sep 17 00:00:00 2001 From: morris Date: Mon, 18 Dec 2023 17:02:10 +0800 Subject: [PATCH] fix(gdma): reserve the SOC_GDMA_PAIRS_PER_GROUP Closes https://github.com/espressif/esp-idf/issues/12798 --- components/soc/esp32s3/include/soc/Kconfig.soc_caps.in | 4 ++++ components/soc/esp32s3/include/soc/soc_caps.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index d257fb5f6b..f75219ae1e 100644 --- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in @@ -399,6 +399,10 @@ config SOC_GDMA_NUM_GROUPS_MAX int default 1 +config SOC_GDMA_PAIRS_PER_GROUP + int + default 5 + config SOC_GDMA_PAIRS_PER_GROUP_MAX int default 5 diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 599234a386..ddc9edb9e8 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -156,7 +156,8 @@ /*-------------------------- GDMA CAPS ---------------------------------------*/ #define SOC_AHB_GDMA_VERSION 1U #define SOC_GDMA_NUM_GROUPS_MAX 1U -#define SOC_GDMA_PAIRS_PER_GROUP_MAX 5 +#define SOC_GDMA_PAIRS_PER_GROUP 5 // esp32s3 has only one kind of GDMA, which is AHB GDMA, and it has 5 pairs in total. +#define SOC_GDMA_PAIRS_PER_GROUP_MAX 5 // when there're multiple GDMA instances, this macro represents the maximum number of GDMA pairs in the same group. #define SOC_AHB_GDMA_SUPPORT_PSRAM 1 /*-------------------------- GPIO CAPS ---------------------------------------*/