From 0172656723a59756db2ce01177282e37b269e1d4 Mon Sep 17 00:00:00 2001 From: Eric Yilun Lin Date: Mon, 14 Dec 2020 04:19:29 +0000 Subject: [PATCH] Revert "zephyr: Add battery and smart battery options" This reverts commit ac4f512e60af42efe693e6955c110a7908090e56. Reason for revert: This CL stops chipset_task forever, revert this to boot AP. Original change's description: > zephyr: Add battery and smart battery options > > Shim in battery and smart battery support. > > BUG=b:175248556 > BRANCH=none > TEST=boot on volteer, run 'battery' command. > TEST=run 'ninja menuconfig' and check KConfig help text. > 20-12-10 20:08:12.778 battery > 20-12-10 20:08:13.509 Status: 0x02c0 DCHG INIT RC > 20-12-10 20:08:13.529 Param flags:00000003 > 20-12-10 20:08:13.541 Temp: 0x0b63 = %.1d K (%.1d C) > 20-12-10 20:08:13.541 V: 0x2a1e = 10782 mV > 20-12-10 20:08:13.541 V-desired: 0x3390 = 13200 mV > 20-12-10 20:08:13.541 I: 0x0000 = 0 mA > 20-12-10 20:08:13.550 I-desired: 0x0a19 = 2585 mA > 20-12-10 20:08:13.550 Charging: Allowed > 20-12-10 20:08:13.550 Charge: 0 % > 20-12-10 20:08:13.550 Manuf: LG > 20-12-10 20:08:13.555 Device: AC17A8 > 20-12-10 20:08:13.573 Chem: LIO > 20-12-10 20:08:13.573 Serial: 0xb754 > 20-12-10 20:08:13.573 V-design: 0x2d1e = 11550 mV > 20-12-10 20:08:13.573 Mode: 0x6001 > 20-12-10 20:08:13.573 Abs charge:0 % > 20-12-10 20:08:13.573 Remaining: 0 mAh > 20-12-10 20:08:13.577 Cap-full: 4932 mAh (4833 mAh with 98 % compensation) > 20-12-10 20:08:13.585 Design: 5360 mAh > 20-12-10 20:08:13.594 Time-full: 0h:0 > 20-12-10 20:08:13.594 Empty: 0h:0 > > Change-Id: Ie782e75ee4027ab2a5c6a0ae7f4ad81e9c360711 > Signed-off-by: Simon Glass > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2575199 Bug: b:175248556 Change-Id: I66086d8fee46d5fd02d26938468a7d76dab71c6e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2589140 Reviewed-by: Eric Yilun Lin Commit-Queue: Eric Yilun Lin Tested-by: Eric Yilun Lin --- power/common.c | 2 -- zephyr/Kconfig | 1 - zephyr/Kconfig.battery | 52 ------------------------------- zephyr/shim/include/config_chip.h | 20 ------------ 4 files changed, 75 deletions(-) delete mode 100644 zephyr/Kconfig.battery diff --git a/power/common.c b/power/common.c index 6f14e69989..ea6190d523 100644 --- a/power/common.c +++ b/power/common.c @@ -663,8 +663,6 @@ void chipset_task(void *u) static uint32_t last_in_signals; while (1) { - msleep(100); - continue; /* * In order to prevent repeated console spam, only print the * current power state if something has actually changed. It's diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 8e533f7718..fcb7df19c9 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -12,7 +12,6 @@ menuconfig PLATFORM_EC if PLATFORM_EC -rsource "Kconfig.battery" rsource "Kconfig.powerseq" rsource "Kconfig.tasks" diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery deleted file mode 100644 index 840408c188..0000000000 --- a/zephyr/Kconfig.battery +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -config PLATFORM_EC_BATTERY - bool "Support batteries" - help - Enables battery support on the board. Requires selection of a battery - and a charger IC. - - If using I2C batteries, you must dedine I2C_PORT_BATTERY in your - board's i2c_map.h file so that the EC code will know which I2C - port the battery is on. - -if PLATFORM_EC_BATTERY - -choice "Battery select" - prompt "Select the battery to use" - help - Select the battery used on the board. If you are ensure, select the - smart battery option. - -config PLATFORM_EC_BATTERY_SMART - bool "Support a smart battery" - depends on PLATFORM_EC_I2C - help - Many batteries support the Smart Battery Specification and therefore - have common registers which can be accessed to control and monitor - the battery. - - See here for the spec: http://sbs-forum.org/specs/sbdat110.pdf - -endchoice - -choice "Charger select" - prompt "Select the charger to use" - help - Select the battery charger IC used on the board. Only one charger may - be selected. - -config PLATFORM_EC_CHARGER_ISL9237 - bool "Use the ISL9237 charger" - depends on PLATFORM_EC_I2C - help - Enables a driver for the ISL9237 VCD Battery Charger. This is a - buck-boost, narrow-output-voltage charger supporting an input voltage - of 3.2-23.4V and output of 2.4 V-13.8V. It provides an I2C interace - for configuration. - -endchoice - -endif # PLATFORM_EC_BATTERY diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 3e5eaaf6a1..4759e6373e 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -26,26 +26,6 @@ #define CONFIG_CHIPSET_TIGERLAKE #endif -/* Battery configuration */ -#undef CONFIG_BATTERY -#undef CONFIG_BATTERY_FUEL_GAUGE -#ifdef CONFIG_PLATFORM_EC_BATTERY -#define CONFIG_BATTERY -#define CONFIG_BATTERY_FUEL_GAUGE -#endif - -#undef CONFIG_CHARGER_ISL9237 -#ifdef CONFIG_PLATFORM_EC_CHARGER_ISL9237 -#define CONFIG_CHARGER_ISL9237 -/* Hardware based charge ramp is broken in the ISL9241 (b/169350714) */ -#define CONFIG_CHARGE_RAMP_SW -#endif - -#undef CONFIG_BATTERY_SMART -#ifdef CONFIG_PLATFORM_EC_BATTERY_SMART -#define CONFIG_BATTERY_SMART -#endif - /* eSPI configuration */ #ifdef CONFIG_PLATFORM_EC_ESPI