diff --git a/boards/arm/frdm_k22f/Kconfig.defconfig b/boards/arm/frdm_k22f/Kconfig.defconfig index 798b1d3d7f1..8197c49fa2d 100644 --- a/boards/arm/frdm_k22f/Kconfig.defconfig +++ b/boards/arm/frdm_k22f/Kconfig.defconfig @@ -43,10 +43,6 @@ config I2C_0 default y depends on I2C -config ADC_0 - default y - depends on ADC - config PWM_3 default y depends on PWM_MCUX_FTM diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig index a8edad2806c..f44cae960e7 100644 --- a/boards/arm/frdm_k64f/Kconfig.defconfig +++ b/boards/arm/frdm_k64f/Kconfig.defconfig @@ -43,12 +43,8 @@ config I2C_0 default y depends on I2C -config ADC_1 - default y - depends on ADC - config TEMP_KINETIS - default y if ADC_1 + default y if "$(dt_nodelabel_enabled,adc1)" depends on SENSOR config PWM_3 diff --git a/boards/arm/frdm_kl25z/Kconfig.defconfig b/boards/arm/frdm_kl25z/Kconfig.defconfig index 7ad27b10bae..3329daa2bf6 100644 --- a/boards/arm/frdm_kl25z/Kconfig.defconfig +++ b/boards/arm/frdm_kl25z/Kconfig.defconfig @@ -46,8 +46,4 @@ config I2C_0 default y depends on I2C -config ADC_0 - default y - depends on ADC - endif # BOARD_FRDM_KL25Z diff --git a/boards/arm/frdm_kw41z/Kconfig.defconfig b/boards/arm/frdm_kw41z/Kconfig.defconfig index 547d82c7197..34304c28d36 100644 --- a/boards/arm/frdm_kw41z/Kconfig.defconfig +++ b/boards/arm/frdm_kw41z/Kconfig.defconfig @@ -34,10 +34,6 @@ config I2C_1 default y depends on I2C -config ADC_0 - default y - depends on ADC - config FXOS8700_DRDY_INT1 default y depends on FXOS8700 diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig index cce8cda71db..2220f221b33 100644 --- a/boards/arm/hexiwear_k64/Kconfig.defconfig +++ b/boards/arm/hexiwear_k64/Kconfig.defconfig @@ -51,9 +51,6 @@ endif # I2C if ADC -config ADC_0 - default y - config BATTERY_SENSE default y diff --git a/boards/arm/hexiwear_kw40z/Kconfig.defconfig b/boards/arm/hexiwear_kw40z/Kconfig.defconfig index 6a5761658c6..fbe0ec92a01 100644 --- a/boards/arm/hexiwear_kw40z/Kconfig.defconfig +++ b/boards/arm/hexiwear_kw40z/Kconfig.defconfig @@ -34,8 +34,4 @@ config I2C_1 default y depends on I2C -config ADC_0 - default y - depends on ADC - endif # BOARD_HEXIWEAR_KW40Z diff --git a/boards/arm/nucleo_f091rc/Kconfig.defconfig b/boards/arm/nucleo_f091rc/Kconfig.defconfig index 9c5d5eb2c84..bd4fedf1b5a 100644 --- a/boards/arm/nucleo_f091rc/Kconfig.defconfig +++ b/boards/arm/nucleo_f091rc/Kconfig.defconfig @@ -12,8 +12,4 @@ config SPI_STM32_INTERRUPT default y depends on SPI -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F091RC diff --git a/boards/arm/nucleo_f103rb/Kconfig.defconfig b/boards/arm/nucleo_f103rb/Kconfig.defconfig index 289ec1d328f..2ee46193cf6 100644 --- a/boards/arm/nucleo_f103rb/Kconfig.defconfig +++ b/boards/arm/nucleo_f103rb/Kconfig.defconfig @@ -12,8 +12,4 @@ config PWM_STM32_1 default y depends on PWM -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F103RB diff --git a/boards/arm/nucleo_f207zg/Kconfig.defconfig b/boards/arm/nucleo_f207zg/Kconfig.defconfig index 5d5aaf617b5..5f821e3e7f9 100644 --- a/boards/arm/nucleo_f207zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f207zg/Kconfig.defconfig @@ -18,8 +18,4 @@ config ETH_STM32_HAL endif # NETWORKING -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F207ZG diff --git a/boards/arm/nucleo_f302r8/Kconfig.defconfig b/boards/arm/nucleo_f302r8/Kconfig.defconfig index 1c23a517289..7f1eaf19543 100644 --- a/boards/arm/nucleo_f302r8/Kconfig.defconfig +++ b/boards/arm/nucleo_f302r8/Kconfig.defconfig @@ -13,8 +13,4 @@ config PWM_STM32_2 default y depends on PWM -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F302R8 diff --git a/boards/arm/nucleo_f401re/Kconfig.defconfig b/boards/arm/nucleo_f401re/Kconfig.defconfig index 214fcfeea92..7845916695c 100644 --- a/boards/arm/nucleo_f401re/Kconfig.defconfig +++ b/boards/arm/nucleo_f401re/Kconfig.defconfig @@ -27,8 +27,4 @@ config IWDG_STM32 endif # WATCHDOG -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F401RE diff --git a/boards/arm/nucleo_f746zg/Kconfig.defconfig b/boards/arm/nucleo_f746zg/Kconfig.defconfig index 0b7c6780881..3d449435222 100644 --- a/boards/arm/nucleo_f746zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f746zg/Kconfig.defconfig @@ -23,8 +23,4 @@ config PWM_STM32_1 default y depends on PWM -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F746ZG diff --git a/boards/arm/nucleo_f767zi/Kconfig.defconfig b/boards/arm/nucleo_f767zi/Kconfig.defconfig index a116070f33d..4d8769f6f85 100644 --- a/boards/arm/nucleo_f767zi/Kconfig.defconfig +++ b/boards/arm/nucleo_f767zi/Kconfig.defconfig @@ -23,8 +23,4 @@ config PWM_STM32_1 default y depends on PWM -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_F767ZI diff --git a/boards/arm/nucleo_l073rz/Kconfig.defconfig b/boards/arm/nucleo_l073rz/Kconfig.defconfig index 40c3dea9acd..6a73209134a 100644 --- a/boards/arm/nucleo_l073rz/Kconfig.defconfig +++ b/boards/arm/nucleo_l073rz/Kconfig.defconfig @@ -12,8 +12,4 @@ config SPI_STM32_INTERRUPT default y depends on SPI -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_L073RZ diff --git a/boards/arm/nucleo_l152re/Kconfig.defconfig b/boards/arm/nucleo_l152re/Kconfig.defconfig index 11ac4d67464..70a209468fc 100644 --- a/boards/arm/nucleo_l152re/Kconfig.defconfig +++ b/boards/arm/nucleo_l152re/Kconfig.defconfig @@ -9,9 +9,4 @@ if BOARD_NUCLEO_L152RE config BOARD default "nucleo_l152re" - -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_L152RE diff --git a/boards/arm/nucleo_l476rg/Kconfig.defconfig b/boards/arm/nucleo_l476rg/Kconfig.defconfig index 8036a9a56c6..11bbbe95dcf 100644 --- a/boards/arm/nucleo_l476rg/Kconfig.defconfig +++ b/boards/arm/nucleo_l476rg/Kconfig.defconfig @@ -18,8 +18,4 @@ config PWM_STM32_2 default y depends on PWM -config ADC_1 - default y - depends on ADC - endif # BOARD_NUCLEO_L476RG diff --git a/boards/arm/nucleo_wb55rg/Kconfig.defconfig b/boards/arm/nucleo_wb55rg/Kconfig.defconfig index d2ba9a11791..ae12a3ecea5 100644 --- a/boards/arm/nucleo_wb55rg/Kconfig.defconfig +++ b/boards/arm/nucleo_wb55rg/Kconfig.defconfig @@ -16,11 +16,6 @@ choice STM32_LPTIM_CLOCK depends on STM32_LPTIM_TIMER endchoice - -config ADC_1 - default y - depends on ADC - choice BT_HCI_BUS_TYPE default BT_STM32_IPM depends on BT diff --git a/boards/arm/sam_e70_xplained/Kconfig.defconfig b/boards/arm/sam_e70_xplained/Kconfig.defconfig index 257bb158290..1cdf6f1a8ff 100644 --- a/boards/arm/sam_e70_xplained/Kconfig.defconfig +++ b/boards/arm/sam_e70_xplained/Kconfig.defconfig @@ -43,10 +43,6 @@ config ETH_SAM_GMAC_MAC_I2C_EEPROM endif # ETH_SAM_GMAC -config ADC_0 - default y - depends on ADC - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/arm/sam_v71_xult/Kconfig.defconfig b/boards/arm/sam_v71_xult/Kconfig.defconfig index 4976f84f3ed..bdbc0cbe9b6 100644 --- a/boards/arm/sam_v71_xult/Kconfig.defconfig +++ b/boards/arm/sam_v71_xult/Kconfig.defconfig @@ -43,10 +43,6 @@ config ETH_SAM_GMAC_MAC_I2C_EEPROM endif # ETH_SAM_GMAC -config ADC_0 - default y - depends on ADC - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/arm/twr_ke18f/Kconfig.defconfig b/boards/arm/twr_ke18f/Kconfig.defconfig index 7b3718d6eff..4b003df7778 100644 --- a/boards/arm/twr_ke18f/Kconfig.defconfig +++ b/boards/arm/twr_ke18f/Kconfig.defconfig @@ -51,12 +51,8 @@ config PINMUX_MCUX_PORTE endif # PINMUX_MCUX -config ADC_0 - default y - depends on ADC - config TEMP_KINETIS - default y if ADC_0 + default y if "$(dt_nodelabel_enabled,adc0)" depends on SENSOR if PWM diff --git a/boards/arm/usb_kw24d512/Kconfig.defconfig b/boards/arm/usb_kw24d512/Kconfig.defconfig index c536ddeee79..973eb8b2862 100644 --- a/boards/arm/usb_kw24d512/Kconfig.defconfig +++ b/boards/arm/usb_kw24d512/Kconfig.defconfig @@ -50,10 +50,6 @@ config I2C_1 endif # I2C -config ADC_0 - default y - depends on ADC - config PWM_1 default y depends on PWM_MCUX_FTM diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig index 5ed7cc61ae6..90bb835bcb3 100644 --- a/drivers/adc/Kconfig +++ b/drivers/adc/Kconfig @@ -37,15 +37,6 @@ module = ADC module-str = ADC source "subsys/logging/Kconfig.template.log_config" -config ADC_0 - bool "Enable ADC 0" - -config ADC_1 - bool "Enable ADC 1" - -config ADC_2 - bool "Enable ADC 2" - source "drivers/adc/Kconfig.mcux" source "drivers/adc/Kconfig.nrfx" diff --git a/drivers/adc/Kconfig.nrfx b/drivers/adc/Kconfig.nrfx index 27f17676a76..86a343b9a30 100644 --- a/drivers/adc/Kconfig.nrfx +++ b/drivers/adc/Kconfig.nrfx @@ -33,10 +33,3 @@ config ADC_NRFX_SAADC select ADC_CONFIGURABLE_INPUTS help Enable support for nrfx SAADC driver. - -# We enable ADC_0 here for the sake of other code in Zephyr that -# depends on it. Device instantiation within nRF ADC drivers is -# entirely driven by whether the devicetree nodes with compatibles -# nordic,nrf-adc and nordic,nrf-saadc are enabled. -config ADC_0 - def_bool ADC_NRFX_ADC || ADC_NRFX_SAADC diff --git a/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf b/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf index 9cc28af15bc..d3cb0693883 100644 --- a/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf +++ b/tests/drivers/adc/adc_api/boards/sam_e70_xplained.conf @@ -1,3 +1,2 @@ CONFIG_ADC=y CONFIG_ADC_SAM_AFEC=y -CONFIG_ADC_0=y diff --git a/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf b/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf index 9cc28af15bc..d3cb0693883 100644 --- a/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf +++ b/tests/drivers/adc/adc_api/boards/sam_v71_xult.conf @@ -1,3 +1,2 @@ CONFIG_ADC=y CONFIG_ADC_SAM_AFEC=y -CONFIG_ADC_0=y diff --git a/tests/drivers/adc/adc_api/prj.conf b/tests/drivers/adc/adc_api/prj.conf index c307b998b93..dd4750abb14 100644 --- a/tests/drivers/adc/adc_api/prj.conf +++ b/tests/drivers/adc/adc_api/prj.conf @@ -2,7 +2,6 @@ CONFIG_ZTEST=y CONFIG_ADC=y CONFIG_ADC_ASYNC=y -CONFIG_ADC_0=y CONFIG_LOG=y CONFIG_ADC_LOG_LEVEL_INF=y CONFIG_LOG_IMMEDIATE=y