This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new fc76b9955c Sort XDMA support for SAMA5D2 ADC&TSD
fc76b9955c is described below
commit fc76b9955cec51311762950270514f5fb92e964f
Author: TimJTi <[email protected]>
AuthorDate: Tue Sep 26 15:06:25 2023 +0100
Sort XDMA support for SAMA5D2 ADC&TSD
---
arch/arm/src/sama5/Kconfig | 2 +-
arch/arm/src/sama5/sam_adc.c | 24 +++++++++++++-----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index e6bfe64283..f290565b34 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -4260,7 +4260,7 @@ if SAMA5_ADC_HAVE_CHAN
config SAMA5_ADC_DMA
bool "DMA Support"
default n
- depends on SAMA5_DMAC1
+ depends on SAMA5_DMAC1 || SAMA5_XDMAC0 || SAMA5_XDMAC1
---help---
Enable DMA transfers of converted data. This option is only
useful if you have numerous DMA channels enabled. The end
result
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index eca2d41ff0..fe0be104d1 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -318,14 +318,20 @@
/* DMA configuration flags */
#ifdef CONFIG_SAMA5_ADC_DMA
+# ifdef ATSAMA5D2
+# define DMACH_FLAG_PERIPHAHB_AHB DMACH_FLAG_PERIPHAHB_AHB_IF1
+# else
+# define DMACH_FLAG_PERIPHAHB_AHB DMACH_FLAG_PERIPHAHB_AHB_IF2
+# endif
+
# define DMA_FLAGS \
- DMACH_FLAG_FIFOCFG_LARGEST | \
- DMACH_FLAG_PERIPHPID(SAM_IRQ_ADC) | DMACH_FLAG_PERIPHAHB_AHB_IF2 | \
- DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH | \
- DMACH_FLAG_PERIPHWIDTH_16BITS | DMACH_FLAG_PERIPHCHUNKSIZE_1 | \
- DMACH_FLAG_MEMPID_MAX | DMACH_FLAG_MEMAHB_AHB_IF0 | \
- DMACH_FLAG_MEMWIDTH_16BITS | DMACH_FLAG_MEMINCREMENT | \
- DMACH_FLAG_MEMCHUNKSIZE_1 | DMACH_FLAG_MEMBURST_4)
+ DMACH_FLAG_FIFOCFG_LARGEST | DMACH_FLAG_PERIPHPID(SAM_IRQ_ADC) | \
+ DMACH_FLAG_PERIPHAHB_AHB | DMACH_FLAG_PERIPHH2SEL | \
+ DMACH_FLAG_PERIPHISPERIPH | DMACH_FLAG_PERIPHWIDTH_16BITS | \
+ DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_MEMPID_MAX | \
+ DMACH_FLAG_MEMAHB_AHB_IF0 | DMACH_FLAG_MEMWIDTH_16BITS | \
+ DMACH_FLAG_MEMINCREMENT | DMACH_FLAG_MEMCHUNKSIZE_1 | \
+ DMACH_FLAG_MEMBURST_4
#endif
/* Pick an unused channel number */
@@ -1244,10 +1250,6 @@ static int sam_adc_setup(struct adc_dev_s *dev)
static void sam_adc_shutdown(struct adc_dev_s *dev)
{
-#ifdef CONFIG_SAMA5_ADC_DMA
- struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv;
-#endif
-
ainfo("Shutdown\n");
/* Reset the ADC peripheral */
