feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/gdma_legacy_macro_back_again' into 'master'

Browse Source 
fix(gdma): reserve the SOC_GDMA_PAIRS_PER_GROUP

Closes IDFGH-11688

See merge request espressif/esp-idf!27981
This commit is contained in:
morris
2023-12-21 14:52:58 +08:00
parent 21fa29fedf b00f5dd340
commit 8863d0930e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@ -403,6 +403,10 @@ config SOC_GDMA_NUM_GROUPS_MAX
int int
default 1 default 1
config SOC_GDMA_PAIRS_PER_GROUP
int
default 5
config SOC_GDMA_PAIRS_PER_GROUP_MAX config SOC_GDMA_PAIRS_PER_GROUP_MAX
int int
default 5 default 5

3
components/soc/esp32s3/include/soc/soc_caps.h
View File

@ -154,7 +154,8 @@
/*-------------------------- GDMA CAPS ---------------------------------------*/ /*-------------------------- GDMA CAPS ---------------------------------------*/
#define SOC_AHB_GDMA_VERSION 1U #define SOC_AHB_GDMA_VERSION 1U
#define SOC_GDMA_NUM_GROUPS_MAX 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 #define SOC_AHB_GDMA_SUPPORT_PSRAM 1
/*-------------------------- GPIO CAPS ---------------------------------------*/ /*-------------------------- GPIO CAPS ---------------------------------------*/