Merge branch 'bugfix/gdma_legacy_macro_back_again_v5.2' into 'release…

…/v5.2' fix(gdma): reserve the SOC_GDMA_PAIRS_PER_GROUP (v5.2) See merge request espressif/esp-idf!28054
espressif · Dec 22, 2023 · 0056ab4 · 0056ab4
2 parents c6bf363 + b893744
commit 0056ab4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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 ---------------------------------------*/