summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-05-08 15:33:31 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-05-11 14:04:30 +0000
commitb729eab7c75553c830b54be5da7a348127f0b49c (patch)
treedb654291e97be430144d4bcad27e4f04db9f87f7 /driver
parentc1b39d008cf6aa8ed53780c5b4ff1bd55951d1b4 (diff)
downloadchrome-ec-b729eab7c75553c830b54be5da7a348127f0b49c.tar.gz
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>
Diffstat (limited to 'driver')
-rw-r--r--driver/charger/bq25710.c2
-rw-r--r--driver/charger/isl923x.c2
-rw-r--r--driver/charger/sm5803.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c
index 222d2f58a4..a13770a02c 100644
--- a/driver/charger/bq25710.c
+++ b/driver/charger/bq25710.c
@@ -9,7 +9,7 @@
#include "battery_smart.h"
#include "bq257x0_regs.h"
#include "charge_ramp.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
#include "charger.h"
#include "common.h"
#include "console.h"
diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c
index a5fae9329d..997838f53e 100644
--- a/driver/charger/isl923x.c
+++ b/driver/charger/isl923x.c
@@ -9,7 +9,7 @@
#include "battery.h"
#include "battery_smart.h"
#include "builtin/assert.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
#include "charger.h"
#include "common.h"
#include "compile_time_macros.h"
diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c
index 391c60956a..a3e22c5b8b 100644
--- a/driver/charger/sm5803.c
+++ b/driver/charger/sm5803.c
@@ -7,7 +7,7 @@
#include "atomic.h"
#include "battery.h"
#include "battery_smart.h"
-#include "charge_state_v2.h"
+#include "charge_state.h"
#include "charger.h"
#include "extpower.h"
#include "gpio.h"