adc: remove Kconfig.defconfig setting of ADC drivers

galak · mmahadevan108 · commit 7e8a312c6b76 · 2022-08-02T15:51:43.000-05:00
Now that ADC drivers are enabled based on devicetree
we need to remove any cases of them getting enabled by
Kconfig.defconfig* files as this can lead to errors.

Typically the Kconfig.defconfig* will blindly enable a
sensor and not respect the devicetree state of the ADC.
Additionally we can get problems with prj.conf/defconfig
getting incorrectly overridden.

Signed-off-by: Kumar Gala &lt;galak@kernel.org&gt;
diff --git a/boards/riscv/tlsr9518adk80d/Kconfig.defconfig b/boards/riscv/tlsr9518adk80d/Kconfig.defconfig
@@ -18,9 +18,6 @@ config IEEE802154_TELINK_B91
 config NET_CONFIG_IEEE802154_DEV_NAME
 	default "IEEE802154_b91"
 
-config ADC_TELINK_B91
-	default y if ADC
-
 if BT
 
 # BLE Controller SDK from hal_telink requires
diff --git a/boards/shields/lmp90100_evb/Kconfig.defconfig b/boards/shields/lmp90100_evb/Kconfig.defconfig
@@ -8,9 +8,6 @@ if ADC
 config SPI
 	default y
 
-config ADC_LMP90XXX
-	default y
-
 config ADC_LMP90XXX_GPIO
 	default y
 
diff --git a/boards/shields/mikroe_adc_click/Kconfig.defconfig b/boards/shields/mikroe_adc_click/Kconfig.defconfig
@@ -8,9 +8,6 @@ if ADC
 config SPI
 	default y
 
-config ADC_MCP320X
-	default y
-
 config ADC_INIT_PRIORITY
 	default 80
 
diff --git a/soc/arm/atmel_sam/same70/Kconfig.defconfig.series b/soc/arm/atmel_sam/same70/Kconfig.defconfig.series
@@ -45,10 +45,6 @@ config DMA_SAM_XDMAC
 	default y
 	depends on DMA
 
-config ADC_SAM_AFEC
-	default y
-	depends on ADC
-
 config I2S_SAM_SSC
 	default y
 	depends on I2S
diff --git a/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series b/soc/arm/atmel_sam/samv71/Kconfig.defconfig.series
@@ -46,10 +46,6 @@ config DMA_SAM_XDMAC
 	default y
 	depends on DMA
 
-config ADC_SAM_AFEC
-	default y
-	depends on ADC
-
 config I2S_SAM_SSC
 	default y
 	depends on I2S
diff --git a/soc/arm/atmel_sam0/common/Kconfig.defconfig.series b/soc/arm/atmel_sam0/common/Kconfig.defconfig.series
@@ -5,9 +5,6 @@
 
 if SOC_FAMILY_SAM0
 
-config ADC_SAM0
-	default ADC
-
 config COUNTER_SAM0_TC32
 	default COUNTER
 
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz b/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz
@@ -15,10 +15,6 @@ config PINMUX_XEC
 config GPIO
 	default y
 
-config ADC_XEC
-	default y
-	depends on ADC
-
 config ESPI_XEC
 	default y
 	depends on ESPI
diff --git a/soc/arm/microchip_mec/mec172x/Kconfig.defconfig.mec172xnsz b/soc/arm/microchip_mec/mec172x/Kconfig.defconfig.mec172xnsz
@@ -15,10 +15,6 @@ config PINMUX_XEC
 	default y
 	depends on PINMUX
 
-config ADC_XEC_V2
-	default y
-	depends on ADC
-
 config ESPI_XEC_V2
 	default y
 	depends on ESPI
diff --git a/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series b/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series
@@ -14,10 +14,6 @@ config NUM_IRQS
 config CORTEX_M_SYSTICK
 	default !NPCX_ITIM_TIMER
 
-config ADC_NPCX
-	default y
-	depends on ADC
-
 config WDT_NPCX
 	default y
 	depends on WATCHDOG
diff --git a/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series b/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series
@@ -14,10 +14,6 @@ config NUM_IRQS
 config CORTEX_M_SYSTICK
 	default !NPCX_ITIM_TIMER
 
-config ADC_NPCX
-	default y
-	depends on ADC
-
 config WDT_NPCX
 	default y
 	depends on WATCHDOG
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series
@@ -70,10 +70,6 @@ config COUNTER_MCUX_GPT
 
 endif # COUNTER
 
-config ADC_MCUX_LPADC
-	default y if HAS_MCUX_LPADC
-	depends on ADC
-
 config WDT_MCUX_IMX_WDOG
 	default y
 	depends on WATCHDOG
diff --git a/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.series
@@ -29,10 +29,6 @@ config ENTROPY_MCUX_TRNG
 	default y if HAS_MCUX_TRNG
 	depends on ENTROPY_GENERATOR
 
-config ADC_MCUX_LPADC
-	default y if HAS_MCUX_LPADC
-	depends on ADC
-
 if FLASH_MCUX_FLEXSPI_XIP
 
 # Avoid RWW hazards by defaulting logging to disabled
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
@@ -8,10 +8,6 @@ if SOC_MK22F51212
 config SOC
 	default "mk22f51212"
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config DAC_MCUX_DAC
 	default y
 	depends on DAC
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
@@ -12,10 +12,6 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 86
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config DAC_MCUX_DAC
 	default y
 	depends on DAC
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18
@@ -12,10 +12,6 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 100
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config DAC_MCUX_DAC
 	default y
 	depends on DAC
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
@@ -19,10 +19,6 @@ config KINETIS_FLASH_CONFIG_FOPT
 	default 0x3f
 	depends on KINETIS_FLASH_CONFIG
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config ENTROPY_MCUX_TRNG
 	default y
 	depends on ENTROPY_GENERATOR
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
@@ -54,10 +54,6 @@ config SOC_FLASH_MCUX
 	default y
 	depends on FLASH
 
-config ADC_MCUX_ADC12
-	default y
-	depends on ADC
-
 config DAC_MCUX_DAC32
 	default y
 	depends on DAC
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 b/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
@@ -11,10 +11,6 @@ config SOC
 config NUM_IRQS
 	default 32
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config SOC_FLASH_MCUX
 	default y
 	depends on FLASH
diff --git a/soc/arm/nxp_kinetis/kv5x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/kv5x/Kconfig.defconfig.series
@@ -12,10 +12,6 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 121
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config SOC_FLASH_MCUX
 	default y
 	depends on FLASH
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
@@ -16,10 +16,6 @@ config SOC
 config NUM_IRQS
 	default 65
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config SPI
 	default y
 
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
@@ -10,10 +10,6 @@ config SOC
 config NUM_IRQS
 	default 32
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config ENTROPY_MCUX_TRNG
 	default y
 	depends on ENTROPY_GENERATOR
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
@@ -11,10 +11,6 @@ config SOC
 config NUM_IRQS
 	default 32
 
-config ADC_MCUX_ADC16
-	default y
-	depends on ADC
-
 config COUNTER_MCUX_RTC
 	default y
 	depends on COUNTER
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28
@@ -20,10 +20,6 @@ config WDT_MCUX_WWDT
 	default y
 	depends on WATCHDOG
 
-config ADC_MCUX_LPADC
-	default y
-	depends on ADC
-
 config DMA_MCUX_LPC
 	default y
 	depends on DMA
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0
@@ -21,10 +21,6 @@ config WDT_MCUX_WWDT
 	default y
 	depends on WATCHDOG
 
-config ADC_MCUX_LPADC
-	default y
-	depends on ADC
-
 config DMA_MCUX_LPC
 	default y
 	depends on DMA
diff --git a/soc/arm/st_stm32/common/Kconfig.defconfig.series b/soc/arm/st_stm32/common/Kconfig.defconfig.series
@@ -45,10 +45,6 @@ config COUNTER_RTC_STM32
 	default y
 	depends on COUNTER
 
-config ADC_STM32
-	default y
-	depends on ADC
-
 if DMA
 
 config DMA_STM32
diff --git a/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series b/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series
@@ -43,10 +43,6 @@ config KSCAN_ITE_IT8XXX2
 	default y
 	depends on KSCAN
 
-config ADC_ITE_IT8XXX2
-	default y
-	depends on ADC
-
 config SOC_FLASH_ITE_IT8XXX2
 	default y
 	depends on FLASH
diff --git a/tests/drivers/adc/adc_api/boards/atsame54_xpro.conf b/tests/drivers/adc/adc_api/boards/atsame54_xpro.conf
diff --git a/tests/drivers/adc/adc_api/boards/atsamr21_xpro.conf b/tests/drivers/adc/adc_api/boards/atsamr21_xpro.conf
diff --git a/tests/drivers/adc/adc_api/boards/native_posix.conf b/tests/drivers/adc/adc_api/boards/native_posix.conf
diff --git a/tests/drivers/adc/adc_api/boards/native_posix_64.conf b/tests/drivers/adc/adc_api/boards/native_posix_64.conf
diff --git a/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf b/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf
diff --git a/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf b/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf
diff --git a/tests/drivers/adc/adc_emul/prj.conf b/tests/drivers/adc/adc_emul/prj.conf
@@ -5,4 +5,3 @@ CONFIG_ADC=y
 CONFIG_ADC_LOG_LEVEL_INF=y
 CONFIG_HEAP_MEM_POOL_SIZE=1024
 CONFIG_TEST_USERSPACE=y
-CONFIG_ADC_EMUL=y
