charger: Move charger_state_v2.h into charge_state.h

We don't have a v1 anymore, so the name makes no sense. Move it into
the existing file.

Include charge_state.h instead of v2, doing this in the same change to
avoid build errors.

This makes no functional change.

BUG=b:218332694
TEST=make buildall

Change-Id: Ic3e3adc45e4d002c2cd5ba8aa65e24686e01d628
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516191
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>

82 files changed, 78 insertions, 82 deletions

diff --git a/board/agah/charger_isl9241.c b/board/agah/charger_isl9241.c
index 902bd57aa3..892c857ad6 100644
--- a/board/agah/charger_isl9241.c
+++ b/board/agah/charger_isl9241.c
@@ -35,7 +35,6 @@
 
 #include "charge_manager.h"
 #include "charge_state.h"
-#include "charge_state_v2.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/ambassador/board.c b/board/ambassador/board.c
index d8de0ec5fa..dd839574b5 100644
--- a/board/ambassador/board.c
+++ b/board/ambassador/board.c
@@ -8,7 +8,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
 #include "core/cortex-m/cpu.h"
diff --git a/board/anahera/board.c b/board/anahera/board.c
index 4b328e6db2..f5fc90a9aa 100644
--- a/board/anahera/board.c
+++ b/board/anahera/board.c
@@ -6,7 +6,7 @@
 #include "battery.h"
 #include "button.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/anahera/charger.c b/board/anahera/charger.c
index 4976abdea6..827152e115 100644
--- a/board/anahera/charger.c
+++ b/board/anahera/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/asurada/board.c b/board/asurada/board.c
index 82cda97dfd..a9b5e0aab4 100644
--- a/board/asurada/board.c
+++ b/board/asurada/board.c
@@ -7,7 +7,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/aurash/board.c b/board/aurash/board.c
index 64a8ca6015..ec833141a7 100644
--- a/board/aurash/board.c
+++ b/board/aurash/board.c
@@ -7,7 +7,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/banshee/charger.c b/board/banshee/charger.c
index c6ee062ab5..76e2712181 100644
--- a/board/banshee/charger.c
+++ b/board/banshee/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/beadrix/board.c b/board/beadrix/board.c
index d14996c6e5..92da9f5295 100644
--- a/board/beadrix/board.c
+++ b/board/beadrix/board.c
@@ -8,7 +8,7 @@
 #include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/charger/isl923x.h"
diff --git a/board/beetley/board.c b/board/beetley/board.c
index 697e2a50fe..7bd12e9bdb 100644
--- a/board/beetley/board.c
+++ b/board/beetley/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_lis2dw12.h"
diff --git a/board/blipper/board.c b/board/blipper/board.c
index 58867cafb2..15a2d4b520 100644
--- a/board/blipper/board.c
+++ b/board/blipper/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_lis2dw12.h"
diff --git a/board/boten/board.c b/board/boten/board.c
index fe23078c4c..c352d12f78 100644
--- a/board/boten/board.c
+++ b/board/boten/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_lis2dw12.h"
 #include "driver/accelgyro_lsm6dsm.h"
diff --git a/board/boxy/board.c b/board/boxy/board.c
index 10ad5aec30..a0f8dd6683 100644
--- a/board/boxy/board.c
+++ b/board/boxy/board.c
@@ -9,7 +9,7 @@
 #include "board.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/ppc/syv682x_public.h"
 #include "driver/tcpm/it83xx_pd.h"
diff --git a/board/brask/board.c b/board/brask/board.c
index be41092f0e..8bdb113ac5 100644
--- a/board/brask/board.c
+++ b/board/brask/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/brya/charger.c b/board/brya/charger.c
index 4976abdea6..827152e115 100644
--- a/board/brya/charger.c
+++ b/board/brya/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/bugzzy/board.c b/board/bugzzy/board.c
index c3f62e8787..5102db15be 100644
--- a/board/bugzzy/board.c
+++ b/board/bugzzy/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/cappy2/board.c b/board/cappy2/board.c
index 99f9f1bf73..9525e9c1f2 100644
--- a/board/cappy2/board.c
+++ b/board/cappy2/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/charger/isl923x.h"
diff --git a/board/cherry/board.c b/board/cherry/board.c
index f8700404ed..8d3faaf621 100644
--- a/board/cherry/board.c
+++ b/board/cherry/board.c
@@ -5,7 +5,7 @@
 /* Cherry board configuration */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "console.h"
 #include "driver/accel_bma422.h"
diff --git a/board/chronicler/board.c b/board/chronicler/board.c
index daec7df9c3..ca6ae5c392 100644
--- a/board/chronicler/board.c
+++ b/board/chronicler/board.c
@@ -9,7 +9,7 @@
 #include "battery_smart.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "driver/sync.h"
 #include "driver/tcpm/ps8xxx.h"
diff --git a/board/constitution/board.c b/board/constitution/board.c
index deb00f6c2c..8a3e56032e 100644
--- a/board/constitution/board.c
+++ b/board/constitution/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/corori/board.c b/board/corori/board.c
index 545765b0d7..0717b73750 100644
--- a/board/corori/board.c
+++ b/board/corori/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/corori2/board.c b/board/corori2/board.c
index 7bfc7d2e10..909099c6f8 100644
--- a/board/corori2/board.c
+++ b/board/corori2/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/cret/board.c b/board/cret/board.c
index 4439a30044..59edd8145a 100644
--- a/board/cret/board.c
+++ b/board/cret/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/crota/charger.c b/board/crota/charger.c
index ce19b66194..7b3edd270d 100644
--- a/board/crota/charger.c
+++ b/board/crota/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/dibbi/board.c b/board/dibbi/board.c
index 5b7e8dd7c5..200a53043c 100644
--- a/board/dibbi/board.c
+++ b/board/dibbi/board.c
@@ -9,7 +9,7 @@
 #include "board.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/ppc/syv682x_public.h"
 #include "driver/tcpm/it83xx_pd.h"
diff --git a/board/dojo/board.c b/board/dojo/board.c
index ca85def38c..28788d4641 100644
--- a/board/dojo/board.c
+++ b/board/dojo/board.c
@@ -7,7 +7,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "console.h"
 #include "cros_board_info.h"
diff --git a/board/dooly/board.c b/board/dooly/board.c
index d0711c9c12..306fc86ae3 100644
--- a/board/dooly/board.c
+++ b/board/dooly/board.c
@@ -9,7 +9,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
 #include "core/cortex-m/cpu.h"
diff --git a/board/drawcia/board.c b/board/drawcia/board.c
index aa0c23c585..78459b6ef5 100644
--- a/board/drawcia/board.c
+++ b/board/drawcia/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/drawcia_riscv/board.c b/board/drawcia_riscv/board.c
index 6cd76b17bd..d8d0189635 100644
--- a/board/drawcia_riscv/board.c
+++ b/board/drawcia_riscv/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/driblee/board.c b/board/driblee/board.c
index fd03b64e03..739be95ce3 100644
--- a/board/driblee/board.c
+++ b/board/driblee/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/drobit/board.c b/board/drobit/board.c
index d51097f97d..ab4e98c887 100644
--- a/board/drobit/board.c
+++ b/board/drobit/board.c
@@ -7,7 +7,7 @@
 #include "accelgyro.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/ppc/syv682x.h"
diff --git a/board/eldrid/board.c b/board/eldrid/board.c
index e43bc79b5b..c5a0bb437e 100644
--- a/board/eldrid/board.c
+++ b/board/eldrid/board.c
@@ -7,7 +7,7 @@
 #include "accelgyro.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "driver/accel_bma2x2.h"
 #include "driver/accelgyro_bmi160.h"
diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c
index 03d0727b70..d2124188ce 100644
--- a/board/ezkinil/board.c
+++ b/board/ezkinil/board.c
@@ -6,7 +6,7 @@
 #include "adc.h"
 #include "button.h"
 #include "cbi_ssfc.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "cros_board_info.h"
 #include "driver/accel_kionix.h"
 #include "driver/accel_kx022.h"
diff --git a/board/felwinter/charger_isl9241.c b/board/felwinter/charger_isl9241.c
index ddb37cbbcb..b86d92965b 100644
--- a/board/felwinter/charger_isl9241.c
+++ b/board/felwinter/charger_isl9241.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/gaelin/board.c b/board/gaelin/board.c
index a2d760b92a..3b87757351 100644
--- a/board/gaelin/board.c
+++ b/board/gaelin/board.c
@@ -6,7 +6,7 @@
 #include "assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/galtic/board.c b/board/galtic/board.c
index 68a36216fe..a05c9f470d 100644
--- a/board/galtic/board.c
+++ b/board/galtic/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_bma2x2.h"
 #include "driver/accel_kionix.h"
diff --git a/board/gimble/board.c b/board/gimble/board.c
index 8b849f7613..0a04dc5714 100644
--- a/board/gimble/board.c
+++ b/board/gimble/board.c
@@ -6,7 +6,7 @@
 #include "battery.h"
 #include "button.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/gimble/charger.c b/board/gimble/charger.c
index 4976abdea6..827152e115 100644
--- a/board/gimble/charger.c
+++ b/board/gimble/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/gladios/board.c b/board/gladios/board.c
index b0fad206c0..551c53f20f 100644
--- a/board/gladios/board.c
+++ b/board/gladios/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/gooey/board.c b/board/gooey/board.c
index 6a9d07dbce..0160832c04 100644
--- a/board/gooey/board.c
+++ b/board/gooey/board.c
@@ -8,7 +8,7 @@
 #include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_lis2dw12.h"
 #include "driver/accelgyro_lsm6dsm.h"
diff --git a/board/goroh/board.c b/board/goroh/board.c
index a9eaa35b92..d13c7cfb1b 100644
--- a/board/goroh/board.c
+++ b/board/goroh/board.c
@@ -7,7 +7,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/haboki/board.c b/board/haboki/board.c
index 2b5e852824..74cf39483b 100644
--- a/board/haboki/board.c
+++ b/board/haboki/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/hades/charger_isl9241.c b/board/hades/charger_isl9241.c
index 4886191fcc..ad59c5f139 100644
--- a/board/hades/charger_isl9241.c
+++ b/board/hades/charger_isl9241.c
@@ -35,7 +35,6 @@
 
 #include "charge_manager.h"
 #include "charge_state.h"
-#include "charge_state_v2.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/kano/charger.c b/board/kano/charger.c
index ddb37cbbcb..b86d92965b 100644
--- a/board/kano/charger.c
+++ b/board/kano/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/kinox/board.c b/board/kinox/board.c
index 5748e5b013..02d741ddc5 100644
--- a/board/kinox/board.c
+++ b/board/kinox/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/kracko/board.c b/board/kracko/board.c
index 025ec5109c..2f69f43632 100644
--- a/board/kracko/board.c
+++ b/board/kracko/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/kuldax/board.c b/board/kuldax/board.c
index 545ee3c23c..c5fb16c5e7 100644
--- a/board/kuldax/board.c
+++ b/board/kuldax/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/lalala/board.c b/board/lalala/board.c
index ed8c5ae2e5..2d9c004f20 100644
--- a/board/lalala/board.c
+++ b/board/lalala/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/lantis/board.c b/board/lantis/board.c
index 92c030def1..600f141639 100644
--- a/board/lantis/board.c
+++ b/board/lantis/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/lisbon/board.c b/board/lisbon/board.c
index b0fad206c0..551c53f20f 100644
--- a/board/lisbon/board.c
+++ b/board/lisbon/board.c
@@ -6,7 +6,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
diff --git a/board/madoo/board.c b/board/madoo/board.c
index a1cdb024f9..bb031c3acf 100644
--- a/board/madoo/board.c
+++ b/board/madoo/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/magolor/board.c b/board/magolor/board.c
index af524d9bfa..7759a38a0c 100644
--- a/board/magolor/board.c
+++ b/board/magolor/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/marasov/charger.c b/board/marasov/charger.c
index c531286643..d78c345f94 100644
--- a/board/marasov/charger.c
+++ b/board/marasov/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/metaknight/board.c b/board/metaknight/board.c
index cde7ed51ec..7675c7c8f5 100644
--- a/board/metaknight/board.c
+++ b/board/metaknight/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/mithrax/charger_isl9241.c b/board/mithrax/charger_isl9241.c
index c6ee062ab5..76e2712181 100644
--- a/board/mithrax/charger_isl9241.c
+++ b/board/mithrax/charger_isl9241.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/moli/board.c b/board/moli/board.c
index e3a7bd0fa9..a8e4eddc9d 100644
--- a/board/moli/board.c
+++ b/board/moli/board.c
@@ -7,7 +7,7 @@
 #include "builtin/assert.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/nocturne/battery.c b/board/nocturne/battery.c
index bfb4b25467..4914f89b2e 100644
--- a/board/nocturne/battery.c
+++ b/board/nocturne/battery.c
@@ -8,7 +8,7 @@
 #include "battery.h"
 #include "battery_smart.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/nocturne/board.c b/board/nocturne/board.c
index b566d43e41..de7671163b 100644
--- a/board/nocturne/board.c
+++ b/board/nocturne/board.c
@@ -9,7 +9,6 @@
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state.h"
-#include "charge_state_v2.h"
 #include "chipset.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/omnigul/charger.c b/board/omnigul/charger.c
index dc8fa76be3..b3ca8dc104 100644
--- a/board/omnigul/charger.c
+++ b/board/omnigul/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/osiris/charger.c b/board/osiris/charger.c
index c6ee062ab5..76e2712181 100644
--- a/board/osiris/charger.c
+++ b/board/osiris/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/pirika/board.c b/board/pirika/board.c
index f153da2ce7..d1baae03f2 100644
--- a/board/pirika/board.c
+++ b/board/pirika/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_kionix.h"
 #include "driver/accelgyro_lsm6dsm.h"
diff --git a/board/primus/board.c b/board/primus/board.c
index 2a8ff39ac7..f42e83c509 100644
--- a/board/primus/board.c
+++ b/board/primus/board.c
@@ -7,7 +7,7 @@
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/primus/charger.c b/board/primus/charger.c
index 4976abdea6..827152e115 100644
--- a/board/primus/charger.c
+++ b/board/primus/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/puff/board.c b/board/puff/board.c
index ce2a59d8cb..7e5c2ad8e6 100644
--- a/board/puff/board.c
+++ b/board/puff/board.c
@@ -8,7 +8,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "chipset.h"
 #include "common.h"
 #include "core/cortex-m/cpu.h"
diff --git a/board/redrix/charger.c b/board/redrix/charger.c
index 4976abdea6..827152e115 100644
--- a/board/redrix/charger.c
+++ b/board/redrix/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/sasuke/board.c b/board/sasuke/board.c
index bc96165f4d..502fa60bd5 100644
--- a/board/sasuke/board.c
+++ b/board/sasuke/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/sasukette/board.c b/board/sasukette/board.c
index f5076382e6..7284d2d3c8 100644
--- a/board/sasukette/board.c
+++ b/board/sasukette/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/bc12/pi3usb9201.h"
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index 9c26757ba0..daa247b385 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -8,7 +8,6 @@
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state.h"
-#include "charge_state_v2.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/shotzo/board.c b/board/shotzo/board.c
index ca90a54301..6ae6d8e55c 100644
--- a/board/shotzo/board.c
+++ b/board/shotzo/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/charger/sm5803.h"
diff --git a/board/spherion/board.c b/board/spherion/board.c
index 0170a8998e..b6df18b119 100644
--- a/board/spherion/board.c
+++ b/board/spherion/board.c
@@ -7,7 +7,7 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/storo/board.c b/board/storo/board.c
index 854838d844..d8f1b09ae1 100644
--- a/board/storo/board.c
+++ b/board/storo/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "cros_board_info.h"
 #include "driver/accel_bma2x2.h"
diff --git a/board/taeko/board.c b/board/taeko/board.c
index a654d4c76a..aaf7f215ff 100644
--- a/board/taeko/board.c
+++ b/board/taeko/board.c
@@ -7,7 +7,7 @@
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/taeko/charger.c b/board/taeko/charger.c
index 4976abdea6..827152e115 100644
--- a/board/taeko/charger.c
+++ b/board/taeko/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/taniks/board.c b/board/taniks/board.c
index 5657de1fe7..fdda313c9e 100644
--- a/board/taniks/board.c
+++ b/board/taniks/board.c
@@ -7,7 +7,7 @@
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/taniks/charger.c b/board/taniks/charger.c
index 4976abdea6..827152e115 100644
--- a/board/taniks/charger.c
+++ b/board/taniks/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/taranza/board.c b/board/taranza/board.c
index 09a44f3b79..2fdeebb57b 100644
--- a/board/taranza/board.c
+++ b/board/taranza/board.c
@@ -9,7 +9,7 @@
 #include "board.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/ppc/syv682x_public.h"
 #include "driver/tcpm/it83xx_pd.h"
diff --git a/board/vell/charger.c b/board/vell/charger.c
index 3f57ca11ed..59d8812993 100644
--- a/board/vell/charger.c
+++ b/board/vell/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/vilboz/board.c b/board/vilboz/board.c
index c14a2152ec..d759865fc7 100644
--- a/board/vilboz/board.c
+++ b/board/vilboz/board.c
@@ -5,7 +5,7 @@
 
 #include "battery_smart.h"
 #include "button.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "cros_board_info.h"
 #include "driver/accel_lis2dw12.h"
 #include "driver/accelgyro_lsm6dsm.h"
diff --git a/board/volmar/charger.c b/board/volmar/charger.c
index c6ee062ab5..76e2712181 100644
--- a/board/volmar/charger.c
+++ b/board/volmar/charger.c
@@ -4,7 +4,7 @@
  */
 
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
diff --git a/board/waddledee/board.c b/board/waddledee/board.c
index 814e2e8921..229573eb42 100644
--- a/board/waddledee/board.c
+++ b/board/waddledee/board.c
@@ -8,7 +8,7 @@
 #include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_kionix.h"
 #include "driver/accelgyro_lsm6dsm.h"
diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c
index 7dc87f38da..80234defdf 100644
--- a/board/waddledoo/board.c
+++ b/board/waddledoo/board.c
@@ -9,7 +9,7 @@
 #include "button.h"
 #include "cbi_fw_config.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/waddledoo2/board.c b/board/waddledoo2/board.c
index 7adb032f98..8a7a2b461d 100644
--- a/board/waddledoo2/board.c
+++ b/board/waddledoo2/board.c
@@ -10,7 +10,7 @@
 #include "cbi_fw_config.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/wheelie/board.c b/board/wheelie/board.c
index a8c5859e9d..f2acbb4efa 100644
--- a/board/wheelie/board.c
+++ b/board/wheelie/board.c
@@ -8,7 +8,7 @@
 #include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "driver/accel_lis2dh.h"
 #include "driver/accelgyro_lsm6dsm.h"