diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 7b79b757d4..f3274bd6a2 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -2622,6 +2622,7 @@ config STM32_ADC1
 	select STM32_HAVE_ADC1_DMA if STM32_STM32F10XX && STM32_DMA1
 	select STM32_HAVE_ADC1_DMA if STM32_STM32F37XX && STM32_DMA1
 	select STM32_HAVE_ADC1_DMA if !STM32_STM32F10XX && STM32_DMA2
+	select STM32_HAVE_ADC1_DMA if STM32_DMAMUX
 
 config STM32_ADC2
 	bool "ADC2"
@@ -2629,6 +2630,7 @@ config STM32_ADC2
 	select STM32_ADC
 	depends on STM32_HAVE_ADC2
 	select STM32_HAVE_ADC2_DMA if STM32_DMA2
+	select STM32_HAVE_ADC2_DMA if STM32_DMAMUX
 
 config STM32_ADC3
 	bool "ADC3"
@@ -2636,6 +2638,7 @@ config STM32_ADC3
 	select STM32_ADC
 	depends on STM32_HAVE_ADC3
 	select STM32_HAVE_ADC3_DMA if STM32_DMA2
+	select STM32_HAVE_ADC3_DMA if STM32_DMAMUX
 
 config STM32_ADC4
 	bool "ADC4"
@@ -2643,6 +2646,7 @@ config STM32_ADC4
 	select STM32_ADC
 	depends on STM32_HAVE_ADC4
 	select STM32_HAVE_ADC4_DMA if STM32_DMA2
+	select STM32_HAVE_ADC4_DMA if STM32_DMAMUX
 
 config STM32_ADC5
 	bool "ADC5"
@@ -2650,6 +2654,7 @@ config STM32_ADC5
 	select STM32_ADC
 	depends on STM32_HAVE_ADC5
 	select STM32_HAVE_ADC5_DMA if STM32_DMA2
+	select STM32_HAVE_ADC5_DMA if STM32_DMAMUX
 
 config STM32_SDADC1
 	bool "SDADC1"
diff --git a/arch/arm/src/stm32/stm32_dma_v1mux.c b/arch/arm/src/stm32/stm32_dma_v1mux.c
index a35034da11..809831b4d2 100644
--- a/arch/arm/src/stm32/stm32_dma_v1mux.c
+++ b/arch/arm/src/stm32/stm32_dma_v1mux.c
@@ -1063,7 +1063,7 @@ void weak_function arm_dma_initialize(void)
  * Input Parameters:
  *   dmamap - Identifies the stream/channel resource. For the STM32+, this
  *     is a bit-encoded value as provided by the DMAMAP_* definitions
- *     in hardware/stm32xrxx_dmamux.h
+ *     in hardware/stm32g4xxxx_dmamux.h
  *
  * Returned Value:
  *   One success, this function returns a non-NULL, void* DMA channel