diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index acbb707d345..83939499c86 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -2203,6 +2203,7 @@ static void adc_shutdown(FAR struct adc_dev_s *dev)
 static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
 {
   FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+  uint32_t regval;
 
   ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0);
 
@@ -2212,8 +2213,15 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
        * end-of-conversion ADC.
        */
 
-      adc_modifyreg(priv, STM32_ADC_IER_OFFSET, 0,
-                    priv->hasdma ? ADC_IER_AWD | ADC_ISR_OVR : ADC_IER_ALLINTS);
+      regval = ADC_IER_ALLINTS;
+#ifdef ADC_HAVE_DMA
+      if (priv->hasdma)
+        {
+          regval &= ~(ADC_IER_EOC | ADC_IER_JEOC);
+        }
+#endif
+
+      adc_modifyreg(priv, STM32_ADC_IER_OFFSET, 0, regval);
     }
   else
     {
@@ -2803,7 +2811,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
 
   /* by MR regval &= ~pending; */
   /* by MR adc_putreg(priv, STM32_ADC_ISR_OFFSET, regval);
- 
+
   adc_putreg(priv, STM32_ADC_ISR_OFFSET, pending); */
   return OK;
 }
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9b508fdd7fa..4ac8a9d0c69 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -345,9 +345,7 @@ menuconfig SPI
 		should be enabled by all platforms that support SPI interfaces.
 		See include/nuttx/spi/spi.h for further SPI driver information.
 
-if SPI
 source drivers/spi/Kconfig
-endif
 
 menuconfig I2S
 	bool "I2S Driver Support"
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ea8b8ac9abc..177d863ee2c 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -3,6 +3,18 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
+config ARCH_HAVE_SPI_CRCGENERATION
+	bool
+	default n
+
+config ARCH_HAVE_SPI_CS_CONTROL
+	bool
+	default n
+
+config ARCH_HAVE_SPI_BITORDER
+	bool
+	default n
+
 if SPI
 
 config SPI_SLAVE
@@ -55,10 +67,6 @@ config SPI_HWFEATURES
 		basically the OR of any specific hardware feature and eanbles
 		the SPI hwfeatures() interface method.
 
-config ARCH_HAVE_SPI_CRCGENERATION
-	bool
-	default n
-
 config SPI_CRCGENERATION
 	bool
 	default n
@@ -69,10 +77,6 @@ config SPI_CRCGENERATION
 		generation of SPI CRCs.  Enables the HWFEAT_CRCGENERATION option
 		as well as the hwfeartures() interface method.
 
-config ARCH_HAVE_SPI_CS_CONTROL
-	bool
-	default n
-
 config SPI_CS_CONTROL
 	bool "SPI CS Behavior Control"
 	default n
@@ -82,10 +86,6 @@ config SPI_CS_CONTROL
 		Enables possibilities to define the behavior of CS.
 		Also enables the hwfeatures() interface method.
 
-config ARCH_HAVE_SPI_BITORDER
-	bool
-	default n
-
 config SPI_BITORDER
 	bool "SPI Bit Order Control"
 	default n