diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index 2c21fadf610..3ed2341a4ba 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1014,7 +1014,6 @@ config STM32F7_ADC1
 	bool "ADC1"
 	default n
 	select STM32F7_ADC
-	select STM32F7_HAVE_ADC1_DMA if STM32F7_DMA1
 	select STM32F7_HAVE_ADC1_DMA if STM32F7_DMA2
 
 config STM32F7_ADC2
@@ -1027,8 +1026,7 @@ config STM32F7_ADC3
 	bool "ADC3"
 	default n
 	select STM32F7_ADC
-	select STM32F7_HAVE_ADC1_DMA if STM32F7_DMA1
-	select STM32F7_HAVE_ADC1_DMA if STM32F7_DMA2
+	select STM32F7_HAVE_ADC3_DMA if STM32F7_DMA2
 
 config STM32F7_BKPSRAM
 	bool "Enable BKP RAM Domain"
diff --git a/arch/arm/src/stm32f7/chip/stm32_adc.h b/arch/arm/src/stm32f7/chip/stm32_adc.h
index 7b0861d77ef..9ac5f681073 100644
--- a/arch/arm/src/stm32f7/chip/stm32_adc.h
+++ b/arch/arm/src/stm32f7/chip/stm32_adc.h
@@ -41,10 +41,6 @@
  * Included Files
  ****************************************************************************************************/
 
-#include <nuttx/config.h>
-
-#include "chip.h"
-
 #include <nuttx/config.h>
 #include "chip.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c
index df3ab7028e2..55593a5d19f 100644
--- a/arch/arm/src/stm32f7/stm32_adc.c
+++ b/arch/arm/src/stm32f7/stm32_adc.c
@@ -131,6 +131,12 @@
 #define ADC_MAX_CHANNELS_DMA   16
 #define ADC_MAX_CHANNELS_NODMA 1
 
+#ifdef ADC_HAVE_DMA
+#  ifndef CONFIG_STM32F7_DMA2
+#    error "STM32F7 ADC DMA support requires CONFIG_STM32F7_DMA2"
+#  endif
+#endif
+
 #ifdef ADC_HAVE_DMA
 #  define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_DMA
 #else
@@ -1133,7 +1139,7 @@ static void adc_dmaconvcallback(DMA_HANDLE handle, uint8_t isr, FAR void *arg)
 
       for (i = 0; i < priv->nchannels; i++)
         {
-          priv->cb->au_receive(dev, priv->current, priv->dmabuffer[priv->current]);
+          priv->cb->au_receive(dev, priv->chanlist[priv->current], priv->dmabuffer[priv->current]);
           priv->current++;
           if (priv->current >= priv->nchannels)
             {
@@ -1721,7 +1727,7 @@ static int adc123_interrupt(int irq, FAR void *context, FAR void *arg)
  *   cchannels - Number of channels
  *
  * Returned Value:
- *   Valid ADC device structure reference on succcess; a NULL on failure
+ *   Valid ADC device structure reference on success; a NULL on failure
  *
  ****************************************************************************/
 
diff --git a/arch/arm/src/stm32f7/stm32_adc.h b/arch/arm/src/stm32f7/stm32_adc.h
index f07afe42db4..fa1c0bb2ec3 100644
--- a/arch/arm/src/stm32f7/stm32_adc.h
+++ b/arch/arm/src/stm32f7/stm32_adc.h
@@ -750,14 +750,14 @@ extern "C"
  *   nchannels - Number of channels
  *
  * Returned Value:
- *   Valid can device structure reference on succcess; a NULL on failure
+ *   Valid ADC device structure reference on success; a NULL on failure
  *
  ****************************************************************************/
 
 struct adc_dev_s;
 struct adc_dev_s *stm32_adc_initialize(int intf,
-                                        FAR const uint8_t *chanlist,
-                                        int nchannels);
+                                       FAR const uint8_t *chanlist,
+                                       int nchannels);
 #undef EXTERN
 #ifdef __cplusplus
 }
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index e1d8256f091..4ff92740046 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -80,7 +80,7 @@
 
 /* Convert the DMA stream base address to the DMA register block address */
 
-#define DMA_BASE(ch)     (ch & 0xfffffc00)
+#define DMA_BASE(ch)     ((ch) & 0xfffffc00)
 
 /****************************************************************************
  * Private Types