From 609f78b75cc4a9793df271ec7a173cd464d9bdc3 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Fri, 31 Jan 2020 15:04:02 +0100 Subject: [PATCH] drivers/adc: stm32: Don't enable ADC instance by default in driver ADC_1 peripheral instance was enabled by default in driver. This is not the usual way to enable peripheral instances, as it makes board configuration unclear. Move activation in boards that are declaring ADC support. Signed-off-by: Erwan Gouriou --- boards/arm/nucleo_f091rc/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f103rb/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f207zg/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f302r8/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f401re/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f746zg/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_f767zi/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_l073rz/Kconfig.defconfig | 7 +++++++ boards/arm/nucleo_l476rg/Kconfig.defconfig | 7 +++++++ drivers/adc/Kconfig.stm32 | 12 +----------- 10 files changed, 64 insertions(+), 11 deletions(-) diff --git a/boards/arm/nucleo_f091rc/Kconfig.defconfig b/boards/arm/nucleo_f091rc/Kconfig.defconfig index 85be593cbb6..9cc3042c466 100644 --- a/boards/arm/nucleo_f091rc/Kconfig.defconfig +++ b/boards/arm/nucleo_f091rc/Kconfig.defconfig @@ -38,4 +38,11 @@ config SPI_STM32_INTERRUPT endif # SPI +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F091RC diff --git a/boards/arm/nucleo_f103rb/Kconfig.defconfig b/boards/arm/nucleo_f103rb/Kconfig.defconfig index 280dd613c6a..296450728d6 100644 --- a/boards/arm/nucleo_f103rb/Kconfig.defconfig +++ b/boards/arm/nucleo_f103rb/Kconfig.defconfig @@ -32,4 +32,11 @@ config SPI_2 endif +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F103RB diff --git a/boards/arm/nucleo_f207zg/Kconfig.defconfig b/boards/arm/nucleo_f207zg/Kconfig.defconfig index 04414b278f5..2bee871e4fd 100644 --- a/boards/arm/nucleo_f207zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f207zg/Kconfig.defconfig @@ -32,4 +32,11 @@ config UART_6 endif # SERIAL +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F207ZG diff --git a/boards/arm/nucleo_f302r8/Kconfig.defconfig b/boards/arm/nucleo_f302r8/Kconfig.defconfig index 6592271e397..efbb1ef9d12 100644 --- a/boards/arm/nucleo_f302r8/Kconfig.defconfig +++ b/boards/arm/nucleo_f302r8/Kconfig.defconfig @@ -43,4 +43,11 @@ config PWM_STM32_2 endif # PWM +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F302R8 diff --git a/boards/arm/nucleo_f401re/Kconfig.defconfig b/boards/arm/nucleo_f401re/Kconfig.defconfig index 5936e180499..084fb94244b 100644 --- a/boards/arm/nucleo_f401re/Kconfig.defconfig +++ b/boards/arm/nucleo_f401re/Kconfig.defconfig @@ -53,4 +53,11 @@ config IWDG_STM32 endif # WATCHDOG +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F401RE diff --git a/boards/arm/nucleo_f746zg/Kconfig.defconfig b/boards/arm/nucleo_f746zg/Kconfig.defconfig index c76b08ba8d1..08c19035d0b 100644 --- a/boards/arm/nucleo_f746zg/Kconfig.defconfig +++ b/boards/arm/nucleo_f746zg/Kconfig.defconfig @@ -60,4 +60,11 @@ config CAN_1 endif # CAN +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F746ZG diff --git a/boards/arm/nucleo_f767zi/Kconfig.defconfig b/boards/arm/nucleo_f767zi/Kconfig.defconfig index e57fbee9f39..5c2eeabd465 100644 --- a/boards/arm/nucleo_f767zi/Kconfig.defconfig +++ b/boards/arm/nucleo_f767zi/Kconfig.defconfig @@ -60,4 +60,11 @@ config CAN_1 endif # CAN +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_F767ZI diff --git a/boards/arm/nucleo_l073rz/Kconfig.defconfig b/boards/arm/nucleo_l073rz/Kconfig.defconfig index 93fcab7e5d1..f5fe2c02aa4 100644 --- a/boards/arm/nucleo_l073rz/Kconfig.defconfig +++ b/boards/arm/nucleo_l073rz/Kconfig.defconfig @@ -32,4 +32,11 @@ config SPI_STM32_INTERRUPT endif # SPI +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_L073RZ diff --git a/boards/arm/nucleo_l476rg/Kconfig.defconfig b/boards/arm/nucleo_l476rg/Kconfig.defconfig index 014dcb0aa2c..6b3217c674c 100644 --- a/boards/arm/nucleo_l476rg/Kconfig.defconfig +++ b/boards/arm/nucleo_l476rg/Kconfig.defconfig @@ -40,4 +40,11 @@ config PWM_STM32_2 endif # PWM +if ADC + +config ADC_1 + default y + +endif # ADC + endif # BOARD_NUCLEO_L476RG diff --git a/drivers/adc/Kconfig.stm32 b/drivers/adc/Kconfig.stm32 index 68e8e0c77b3..a5da9656f14 100644 --- a/drivers/adc/Kconfig.stm32 +++ b/drivers/adc/Kconfig.stm32 @@ -5,18 +5,8 @@ # Copyright (c) 2019 Song Qiang # SPDX-License-Identifier: Apache-2.0 -menuconfig ADC_STM32 +config ADC_STM32 bool "STM32 ADC driver" depends on SOC_FAMILY_STM32 help Enable the driver implementation for the stm32xx ADC - -if ADC_STM32 - -config ADC_1 - prompt "ADC1" - default y - help - Enable ADC1 - -endif # ADC_STM32