zephyr: Kconfig: enable CONFIG_ADC automatically

Enable CONFIG_ADC automatically based devicetree compatible nodes.

BRANCH=none
BUG=none
TEST=cq dry run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I6ed3e352cf442d260c55073ec5e7cb82a5b3d52d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3999721
Reviewed-by: Yuval Peress <peress@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

17 files changed, 5 insertions, 22 deletions

diff --git a/zephyr/Kconfig.adc b/zephyr/Kconfig.adc
index 40ec1e4e89..5efc1a9bd5 100644
--- a/zephyr/Kconfig.adc
+++ b/zephyr/Kconfig.adc
@@ -2,6 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+config ADC
+	default y
+	depends on DT_HAS_NAMED_ADC_CHANNELS_ENABLED
+
 # Note - CONFIG_ADC is defined in upstream Zephyr
 if ADC
 
diff --git a/zephyr/boards/arm/mec1727/mec1727_defconfig b/zephyr/boards/arm/mec1727/mec1727_defconfig
index e8c189750e..fa67548e06 100644
--- a/zephyr/boards/arm/mec1727/mec1727_defconfig
+++ b/zephyr/boards/arm/mec1727/mec1727_defconfig
@@ -13,7 +13,6 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32768
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Serial Drivers
diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig
index c6c8f6c3f4..c982644fa0 100644
--- a/zephyr/boards/arm/npcx7/npcx7_defconfig
+++ b/zephyr/boards/arm/npcx7/npcx7_defconfig
@@ -13,7 +13,6 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Enable console
diff --git a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
index d3b4bcc3a2..8202cf3e12 100644
--- a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
@@ -10,7 +10,6 @@ CONFIG_SOC_NPCX9M3F=y
 CONFIG_BOARD_NPCX9=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Serial Drivers
diff --git a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
index e742904aed..4deeccb897 100644
--- a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
@@ -10,7 +10,6 @@ CONFIG_SOC_NPCX9M7F=y
 CONFIG_BOARD_NPCX9=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Serial Drivers
diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
index faee09f492..b5d098fcb2 100644
--- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
@@ -41,7 +41,6 @@ CONFIG_WATCHDOG=y
 CONFIG_I2C=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # PWM
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
index da75b3d113..db990a38bb 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
@@ -41,7 +41,6 @@ CONFIG_WATCHDOG=y
 CONFIG_I2C=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # PWM
diff --git a/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig b/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig
index a024ab5824..8831b3310d 100644
--- a/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig
+++ b/zephyr/boards/riscv/it8xxx2/it81202bx_defconfig
@@ -11,7 +11,6 @@ CONFIG_SOC_IT81202_BX=y
 CONFIG_BOARD_IT8XXX2=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Power Management
diff --git a/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig b/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig
index 2841b9663c..a989662991 100644
--- a/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig
+++ b/zephyr/boards/riscv/it8xxx2/it81302bx_defconfig
@@ -11,7 +11,6 @@ CONFIG_SOC_IT81302_BX=y
 CONFIG_BOARD_IT8XXX2=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Power Management
diff --git a/zephyr/program/corsola/prj_npcx993_base.conf b/zephyr/program/corsola/prj_npcx993_base.conf
index 5d685679e7..e144e345ed 100644
--- a/zephyr/program/corsola/prj_npcx993_base.conf
+++ b/zephyr/program/corsola/prj_npcx993_base.conf
@@ -12,9 +12,6 @@ CONFIG_SHELL_MINIMAL=n
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
 
-# ADC
-CONFIG_ADC=y
-
 # Charger
 CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y
 CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf
index 5fdf9bcfec..8ffd46d565 100644
--- a/zephyr/program/herobrine/program.conf
+++ b/zephyr/program/herobrine/program.conf
@@ -64,7 +64,6 @@ CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
 CONFIG_PLATFORM_EC_CMD_BUTTON=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Battery
diff --git a/zephyr/program/rex/prj.conf b/zephyr/program/rex/prj.conf
index 16b29fc8ca..6be79dca70 100644
--- a/zephyr/program/rex/prj.conf
+++ b/zephyr/program/rex/prj.conf
@@ -51,9 +51,6 @@ CONFIG_AP_PWRSEQ=y
 CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
 CONFIG_AP_PWRSEQ_S0IX=y
 
-# ADC
-CONFIG_ADC=y
-
 # I2C
 CONFIG_I2C=y
 CONFIG_PLATFORM_EC_HOSTCMD_I2C_CONTROL=y
diff --git a/zephyr/program/skyrim/prj.conf b/zephyr/program/skyrim/prj.conf
index 023d58e611..874f823010 100644
--- a/zephyr/program/skyrim/prj.conf
+++ b/zephyr/program/skyrim/prj.conf
@@ -27,9 +27,6 @@ CONFIG_PLATFORM_EC_PORT80=y
 # Power button
 CONFIG_PLATFORM_EC_POWER_BUTTON=y
 
-# ADC
-CONFIG_ADC=y
-
 # I2C
 CONFIG_I2C=y
 
diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf
index c05717d7ad..934be6e303 100644
--- a/zephyr/program/trogdor/lazor/prj.conf
+++ b/zephyr/program/trogdor/lazor/prj.conf
@@ -63,7 +63,6 @@ CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
 CONFIG_PLATFORM_EC_CMD_BUTTON=y
 
 # ADC
-CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Battery
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 7492366f27..3e3f9db02c 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -57,7 +57,6 @@ CONFIG_EMUL_EEPROM_AT2X=y
 CONFIG_EMUL_SMART_BATTERY=y
 CONFIG_EMUL_BC12_DETECT_PI3USB9201=y
 CONFIG_EMUL_PPC_SYV682X=y
-CONFIG_ADC=y
 CONFIG_ADC_EMUL=y
 CONFIG_EMUL_BMA255=y
 CONFIG_EMUL_BMI=y
diff --git a/zephyr/test/krabby/prj.conf b/zephyr/test/krabby/prj.conf
index 063904d19f..c83242059d 100644
--- a/zephyr/test/krabby/prj.conf
+++ b/zephyr/test/krabby/prj.conf
@@ -6,8 +6,8 @@ CONFIG_ZTEST=y
 CONFIG_ZTEST_ASSERT_VERBOSE=1
 CONFIG_ZTEST_NEW_API=y
 
-CONFIG_ADC=y
 CONFIG_ASSERT=y
+CONFIG_ADC=y
 CONFIG_CROS_EC=y
 CONFIG_EMUL=y
 CONFIG_EMUL_RT9490=y
diff --git a/zephyr/test/vboot_efs2/prj.conf b/zephyr/test/vboot_efs2/prj.conf
index fd7d59caca..172f5ca886 100644
--- a/zephyr/test/vboot_efs2/prj.conf
+++ b/zephyr/test/vboot_efs2/prj.conf
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-CONFIG_ADC=y
 CONFIG_ADC_EMUL=y
 CONFIG_CROS_EC=y
 CONFIG_EMUL_CROS_FLASH=y