summaryrefslogtreecommitdiff
path: root/board/ampton
diff options
context:
space:
mode:
authorPatryk Duda <pdk@semihalf.com>2021-03-18 13:45:17 +0000
committerCommit Bot <commit-bot@chromium.org>2021-03-29 16:29:26 +0000
commitf4b27032e1c508b693bba1f2d6572ad14d42f319 (patch)
treed69d14be564e34efbb81417f9ada83122b7a3c44 /board/ampton
parent6f00183c755fe7c9e77adffb308626443e0b274a (diff)
downloadchrome-ec-f4b27032e1c508b693bba1f2d6572ad14d42f319.tar.gz
Use generic voltage reduce function instead of provided by board
This patch switches implementation of input voltage reduction to generic one. It removes reduce_input_voltage_when_full() function from board code and defines CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV with appropriate voltage. Affected boards: - Ampton - Asurada - Cherry - Dratini - Jinlon - Liara - Nocturne BUG=b:182546058 BRANCH=none TEST=Compile firmware for affected boards. TEST=Flash EC ToT on one of affected boards. Charge battery to full. Shutdown board and check if voltage is reduced. Power on board, check if previous voltage is restored. Signed-off-by: Patryk Duda <pdk@semihalf.com> Change-Id: I8f285e75c11f84f4711d5e6a4008174b6fb639cf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2773219 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/ampton')
-rw-r--r--board/ampton/battery.c34
-rw-r--r--board/ampton/board.h2
2 files changed, 2 insertions, 34 deletions
diff --git a/board/ampton/battery.c b/board/ampton/battery.c
index dab93a4869..ee9b9b96e9 100644
--- a/board/ampton/battery.c
+++ b/board/ampton/battery.c
@@ -120,37 +120,3 @@ const struct board_batt_params board_battery_info[] = {
BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT);
const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_C214;
-static int saved_input_voltage = -1;
-
-/* Lower our input voltage to 5V in S5/G3 when battery is full. */
-static void reduce_input_voltage_when_full(void)
-{
- int max_pd_voltage_mv = pd_get_max_voltage();
- int port;
-
- if (charge_get_percent() == 100 &&
- chipset_in_or_transitioning_to_state(CHIPSET_STATE_ANY_OFF) &&
- max_pd_voltage_mv != 5000) {
- saved_input_voltage = max_pd_voltage_mv;
- max_pd_voltage_mv = 5000;
- }
- else if (saved_input_voltage != -1) {
- /*
- * Chipset is not in S5/G3 or battery is not full and input
- * voltage is reduced
- */
- max_pd_voltage_mv = saved_input_voltage;
- saved_input_voltage = -1;
- }
-
- if (pd_get_max_voltage() != max_pd_voltage_mv) {
- for (port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; port++)
- pd_set_external_voltage_limit(port, max_pd_voltage_mv);
- }
-}
-DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, reduce_input_voltage_when_full,
- HOOK_PRIO_DEFAULT);
-DECLARE_HOOK(HOOK_CHIPSET_STARTUP, reduce_input_voltage_when_full,
- HOOK_PRIO_DEFAULT);
-DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, reduce_input_voltage_when_full,
- HOOK_PRIO_DEFAULT);
diff --git a/board/ampton/board.h b/board/ampton/board.h
index 69304cb7c8..c72378d625 100644
--- a/board/ampton/board.h
+++ b/board/ampton/board.h
@@ -26,6 +26,8 @@
#define CONFIG_LED_COMMON
+#define CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV 5000
+
/* Sensors */
#define CONFIG_TEMP_SENSOR
#define CONFIG_THERMISTOR