From b729eab7c75553c830b54be5da7a348127f0b49c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 8 May 2023 15:33:31 -0600 Subject: 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 Commit-Queue: Simon Glass Tested-by: Simon Glass Reviewed-by: Yuval Peress --- baseboard/asurada/baseboard.c | 1 - baseboard/asurada/usbc_config.c | 2 +- baseboard/brya/charger_bq25720.c | 2 +- baseboard/cherry/baseboard.c | 1 - baseboard/goroh/baseboard.c | 1 - baseboard/grunt/baseboard.c | 1 - baseboard/guybrush/baseboard.c | 1 - baseboard/hatch/baseboard.c | 2 +- baseboard/intelrvp/chg_usb_pd.c | 2 +- baseboard/intelrvp/chg_usb_pd_mecc_1_0.c | 2 +- baseboard/kukui/charger_mt6370.c | 2 +- baseboard/kukui/usb_pd_policy.c | 2 +- baseboard/zork/baseboard.c | 1 - 13 files changed, 7 insertions(+), 13 deletions(-) (limited to 'baseboard') diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c index 0e467140b3..7ff873963d 100644 --- a/baseboard/asurada/baseboard.c +++ b/baseboard/asurada/baseboard.c @@ -9,7 +9,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/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c index 89b027124e..391b9134c5 100644 --- a/baseboard/asurada/usbc_config.c +++ b/baseboard/asurada/usbc_config.c @@ -10,7 +10,7 @@ #include "bc12/mt6360_public.h" #include "bc12/pi3usb9201_public.h" #include "button.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "charger/isl923x_public.h" #include "console.h" diff --git a/baseboard/brya/charger_bq25720.c b/baseboard/brya/charger_bq25720.c index 4976abdea6..827152e115 100644 --- a/baseboard/brya/charger_bq25720.c +++ b/baseboard/brya/charger_bq25720.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/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index 4f43d8d238..c162331f89 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -9,7 +9,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/baseboard/goroh/baseboard.c b/baseboard/goroh/baseboard.c index c94e7a3af9..554437ab6e 100644 --- a/baseboard/goroh/baseboard.c +++ b/baseboard/goroh/baseboard.c @@ -11,7 +11,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/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 37bb61b423..10e66c50dc 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -9,7 +9,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index c79d14cf6d..b65aa5ba8b 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -10,7 +10,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chip/npcx/ps2_chip.h" #include "chip/npcx/pwm_chip.h" diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index b4e37e6bc8..b342cd74ed 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -7,7 +7,7 @@ #include "atomic.h" #include "battery_fuel_gauge.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "console.h" #include "cros_board_info.h" diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c index c4ae3ea72d..60ad6e5cdb 100644 --- a/baseboard/intelrvp/chg_usb_pd.c +++ b/baseboard/intelrvp/chg_usb_pd.c @@ -6,7 +6,7 @@ /* Common USB PD charge configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "gpio.h" #include "hooks.h" #include "tcpm/tcpci.h" diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c index 3f2959ebdb..1d18109f6f 100644 --- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c +++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c @@ -6,7 +6,7 @@ /* Intel-RVP family-specific configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "driver/ppc/sn5s330.h" #include "gpio.h" diff --git a/baseboard/kukui/charger_mt6370.c b/baseboard/kukui/charger_mt6370.c index 80587745ea..d3b8cb10ef 100644 --- a/baseboard/kukui/charger_mt6370.c +++ b/baseboard/kukui/charger_mt6370.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger_mt6370.h" #include "console.h" #include "driver/charger/rt946x.h" diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c index 2f2c141510..1ca7935762 100644 --- a/baseboard/kukui/usb_pd_policy.c +++ b/baseboard/kukui/usb_pd_policy.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "console.h" #include "gpio.h" diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index dcf16cf7c6..e54656f08a 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -11,7 +11,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" -- cgit v1.2.1