config: Merge CONFIG_CHARGER_V2 into CONFIG_CHARGER

For all boards that defined CONFIG_CHARGER, CONFIG_CHARGER_V2 is also
defined. Remove references to CONFIG_CHARGER_V2 from board header files.
Replace CONFIG_CHARGER_V2 in common C modules with CONFIG_CHARGER when
appropriate.

BUG=b:139699769
BRANCH=none
TEST=make buildall -j

Change-Id: I6b54baf4ad2406bbed629b6b272dad9ea6a81280
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1789420
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

26 files changed, 1 insertions, 27 deletions

diff --git a/board/atlas/board.h b/board/atlas/board.h
index c84dd18012..ae81f713b4 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -76,7 +76,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/chell/board.h b/board/chell/board.h
index aaf89ee8f3..5686d0aa28 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -25,7 +25,6 @@
 #define CONFIG_CHARGE_RAMP_HW
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_ISL9237
diff --git a/board/cheza/board.h b/board/cheza/board.h
index b7c4131529..e7e524c06a 100644
--- a/board/cheza/board.h
+++ b/board/cheza/board.h
@@ -77,7 +77,6 @@
 
 /* Charger */
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGE_RAMP_HW
diff --git a/board/coral/board.h b/board/coral/board.h
index 29afbd44ce..4bb007ea5e 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -55,7 +55,6 @@
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGE_STATE_DEBUG
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/elm/board.h b/board/elm/board.h
index 9312782599..555447f06b 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -41,7 +41,6 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_MT817X
 #define CONFIG_CMD_TYPEC
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/eve/board.h b/board/eve/board.h
index ac4e80ce04..b21abb7331 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -87,7 +87,6 @@
 #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 353f3a62b3..9d75d49012 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_MT6370
 #define CONFIG_CHARGER_INPUT_CURRENT 512
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2
 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2
 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000
diff --git a/board/glados/board.h b/board/glados/board.h
index 719a871abd..040e01cc26 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -27,7 +27,6 @@
 #define CONFIG_CHARGE_RAMP_HW
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_ISL9237
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index 072826870b..7ef92652f6 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -42,7 +42,6 @@
 #define CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES 3
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
-#define CONFIG_CHARGER_V2
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h
index 8b6f7149ad..d76e582262 100644
--- a/board/glkrvp_ite/board.h
+++ b/board/glkrvp_ite/board.h
@@ -42,7 +42,6 @@
 #define CONFIG_CHARGER_PROFILE_VOLTAGE_RANGES 3
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10
-#define CONFIG_CHARGER_V2
 #undef  CONFIG_EXTPOWER_DEBOUNCE_MS
 #define CONFIG_EXTPOWER_DEBOUNCE_MS 200
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/hammer/board.h b/board/hammer/board.h
index 77824c1057..88627bd15a 100644
--- a/board/hammer/board.h
+++ b/board/hammer/board.h
@@ -256,7 +256,6 @@
 #ifdef BOARD_WAND
 /* Battery and charger options. */
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_INPUT_CURRENT 128
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
diff --git a/board/jerry/board.h b/board/jerry/board.h
index a7d05165ff..89a141728c 100644
--- a/board/jerry/board.h
+++ b/board/jerry/board.h
@@ -20,7 +20,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24715
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_RK3288
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_FORCE_CONSOLE_RESUME
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c
index 169a059a15..33cb8a48ae 100644
--- a/board/mchpevb1/board.c
+++ b/board/mchpevb1/board.c
@@ -440,8 +440,7 @@ const struct temp_sensor_t temp_sensors[] = {
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
 #else /* mec1701_evb test I2C and EC ADC */
 /*
- * battery charge_get_battery_temp requires CONFIG_CHARGER_V2 and
- * charger task running.
+ * battery charge_get_battery_temp requires charger task running.
  * OR can we call into driver/battery/smart.c
  * int sb_read(int cmd, int *param)
  * sb_read(SB_TEMPERATURE, &batt_new.temperature)
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index e229f29ec4..3c43e20862 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -150,7 +150,6 @@
 
 
 /* #define CONFIG_CHARGER */
-/* #define CONFIG_CHARGER_V2 */
 
 /* #define CONFIG_CHARGER_DISCHARGE_ON_AC */
 /* #define CONFIG_CHARGER_ISL9237 */
diff --git a/board/nami/board.h b/board/nami/board.h
index cfcc6b3d2e..1ca6a54031 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -96,7 +96,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 59f2b395ac..727c1b1fbb 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -77,7 +77,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index f969a5f03d..24768bf7c4 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -73,7 +73,6 @@
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
-#define CONFIG_CHARGER_V2
 #define CONFIG_EXTPOWER_GPIO
 
 /* LEDs */
diff --git a/board/oak/board.h b/board/oak/board.h
index 14f8e5788f..b2e07c8107 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -51,7 +51,6 @@
 #endif /* BOARD_REV */
 
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHIPSET_MT817X
 #define CONFIG_CMD_TYPEC
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 104c77962a..a98b84d48e 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -87,7 +87,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/rammus/board.h b/board/rammus/board.h
index 1a8944e1ef..330df91140 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -73,7 +73,6 @@
 #define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_ISL9238
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/reef/board.h b/board/reef/board.h
index 72f2818a23..a4d6e22593 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -48,7 +48,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index a34392173c..16038bddfa 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -38,7 +38,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index 348375e8da..a427abad0d 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -48,7 +48,6 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP_SW
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/samus/board.h b/board/samus/board.h
index 03a94bd893..f4bc5f6663 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -47,7 +47,6 @@
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BATTERY_REVIVE_DISCONNECT
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BQ24773
 #define CONFIG_CHARGER_ILIM_PIN_DISABLED
 #define CONFIG_CHARGER_SENSE_RESISTOR 5
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 901514f29f..2569f41e14 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_RT9467
 #define CONFIG_CHARGER_INPUT_CURRENT 512
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2
 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2
 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000
diff --git a/board/strago/board.h b/board/strago/board.h
index 68e39d4a3d..db6adcea63 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -69,7 +69,6 @@
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_SMART
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_V2
 #define CONFIG_CHARGER_BQ24770
 #define CONFIG_CHARGER_ILIM_PIN_DISABLED
 #define CONFIG_CHARGER_SENSE_RESISTOR 10