zephyr: Kconfig: enable CONFIG_PLATFORM_EC_BATTERY automatically

Enable CONFIG_PLATFORM_EC_BATTERY automatically based devicetree
compatible nodes.

BRANCH=none
BUG=none
TEST=cq dry run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I909a29f6516b225541d878fd6df7de93d8d61754
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3999725
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Wai-Hong Tam <waihong@google.com>

12 files changed, 2 insertions, 11 deletions

diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery
index 92bce6b618..2aedc00dca 100644
--- a/zephyr/Kconfig.battery
+++ b/zephyr/Kconfig.battery
@@ -4,6 +4,8 @@
 
 menuconfig PLATFORM_EC_BATTERY
 	bool "Battery support"
+	default y
+	depends on DT_HAS_BATTERY_SMART_ENABLED
 	help
 	  Enables battery support on the board. Requires selection of a battery
 	  and a charger IC.
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 422f862809..55968ea8a5 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -108,7 +108,6 @@ CONFIG_CROS_KB_RAW_NPCX=y
 CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
diff --git a/zephyr/program/corsola/prj.conf b/zephyr/program/corsola/prj.conf
index 41162d1a0e..63d128fcc4 100644
--- a/zephyr/program/corsola/prj.conf
+++ b/zephyr/program/corsola/prj.conf
@@ -82,7 +82,6 @@ CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y
 CONFIG_PLATFORM_EC_HOSTCMD=y
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf
index 3391e60dce..9e0b6bd3fc 100644
--- a/zephyr/program/herobrine/program.conf
+++ b/zephyr/program/herobrine/program.conf
@@ -70,7 +70,6 @@ CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY=y
 CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED=y
diff --git a/zephyr/program/intelrvp/prj.conf b/zephyr/program/intelrvp/prj.conf
index df04eca101..46e332d91c 100644
--- a/zephyr/program/intelrvp/prj.conf
+++ b/zephyr/program/intelrvp/prj.conf
@@ -12,7 +12,6 @@ CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
 CONFIG_SHIMMED_TASKS=y
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index 35d0efde17..9c4f6ca0b0 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -132,7 +132,6 @@ CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_CDP=y
 CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_INVERTED=y
 
 # Battery support
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
diff --git a/zephyr/program/rex/prj.conf b/zephyr/program/rex/prj.conf
index 7dcb2894da..05c8a5e9d8 100644
--- a/zephyr/program/rex/prj.conf
+++ b/zephyr/program/rex/prj.conf
@@ -82,7 +82,6 @@ CONFIG_PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK=y
 CONFIG_PLATFORM_EC_LED_DT=y
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
diff --git a/zephyr/program/skyrim/prj.conf b/zephyr/program/skyrim/prj.conf
index 760f1f3275..29dd50c151 100644
--- a/zephyr/program/skyrim/prj.conf
+++ b/zephyr/program/skyrim/prj.conf
@@ -81,7 +81,6 @@ CONFIG_PWM_SHELL=n
 CONFIG_SYSCON=y
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf
index 358de69d68..84a71ee5a8 100644
--- a/zephyr/program/trogdor/lazor/prj.conf
+++ b/zephyr/program/trogdor/lazor/prj.conf
@@ -68,7 +68,6 @@ CONFIG_ADC=y
 CONFIG_ADC_SHELL=n
 
 # Battery
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY=y
 CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED=y
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 97257c1c75..7492366f27 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -84,7 +84,6 @@ CONFIG_PLATFORM_EC_USB_CHARGER=y
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
 CONFIG_PLATFORM_EC_USB_POWER_DELIVERY=y
 CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y
 CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CHARGER=y
diff --git a/zephyr/test/krabby/prj.conf b/zephyr/test/krabby/prj.conf
index ddf5a29c21..85648b523c 100644
--- a/zephyr/test/krabby/prj.conf
+++ b/zephyr/test/krabby/prj.conf
@@ -19,7 +19,6 @@ CONFIG_I2C_EMUL=y
 
 CONFIG_PLATFORM_EC=y
 CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
 CONFIG_PLATFORM_EC_CHARGER=y
diff --git a/zephyr/test/vboot_efs2/prj.conf b/zephyr/test/vboot_efs2/prj.conf
index f085fa8f73..fd7d59caca 100644
--- a/zephyr/test/vboot_efs2/prj.conf
+++ b/zephyr/test/vboot_efs2/prj.conf
@@ -13,7 +13,6 @@ CONFIG_I2C=y
 CONFIG_I2C_EMUL=y
 CONFIG_PLATFORM_EC=y
 CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
-CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y