diff options
| author | Ting Shen <phoenixshen@chromium.org> | 2019-11-25 10:09:29 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-29 11:13:28 +0000 |
| commit | 81beef1408aa58c2aa88e4440e1f1560f2967873 (patch) | |
| tree | 4a2b17fd9bb75618551a72393e062c6272c5cc78 | |
| parent | 3a90729933c1fa96662bd1361b5454db0ff3ff54 (diff) | |
| download | chrome-ec-81beef1408aa58c2aa88e4440e1f1560f2967873.tar.gz | |
Revert "kukui: remove virtual battery for devices with smart battery"
This reverts commit c1edf25f4d3000529994be1ac1af166c69df47a3.
Reason for revert: still need virtual battery on kodama/jacuzzi to
let OS side has a more stable data.
Original change's description:
> kukui: remove virtual battery for devices with smart battery
>
> CONFIG_I2C_VIRTUAL_BATTERY/CONFIG_I2C_PASSTHRU_RESTRICTED is for devices
> with dumb battery to simulate smart battery interface. Remove these
> flags for devices with smart battery.
>
> BUG=b:140847169
> TEST=ectool i2cread 8 1 0x16 <reg>, where reg = 0x00~0x03
> BRANCH=master
>
> Change-Id: I6088f66596e626f62320ee4ab181e972016aa80c
> Signed-off-by: Ting Shen <phoenixshen@chromium.org>
> Reviewed-on: http://crrev.com/c/1799289
> Reviewed-by: Xiong Huang <xiong.huang@bitland.corp-partner.google.com>
> Reviewed-by: Yilun Lin <yllin@chromium.org>
> Tested-by: Xiong Huang <xiong.huang@bitland.corp-partner.google.com>
> Commit-Queue: Sean Abraham <seanabraham@chromium.org>
BUG=b:144195782
TEST=`ectool i2cxfer 2 0x0B 16 0x21` multiple times.
BRANCH=master
Change-Id: I999328cd22561fd9f15eef23bc15be980b66bb8d
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1933793
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | baseboard/kukui/baseboard.c | 2 | ||||
| -rw-r--r-- | baseboard/kukui/baseboard.h | 7 | ||||
| -rw-r--r-- | board/damu/board.h | 1 | ||||
| -rw-r--r-- | board/jacuzzi/board.h | 1 | ||||
| -rw-r--r-- | board/kappa/board.h | 1 | ||||
| -rw-r--r-- | board/kodama/board.h | 1 |
6 files changed, 6 insertions, 7 deletions
diff --git a/baseboard/kukui/baseboard.c b/baseboard/kukui/baseboard.c index bdd4277b5c..57a38bffc2 100644 --- a/baseboard/kukui/baseboard.c +++ b/baseboard/kukui/baseboard.c @@ -122,9 +122,7 @@ static void baseboard_spi_init(void) } DECLARE_HOOK(HOOK_INIT, baseboard_spi_init, HOOK_PRIO_INIT_SPI + 1); -#ifndef VARIANT_KUKUI_BATTERY_SMART int board_allow_i2c_passthru(int port) { return (port == I2C_PORT_VIRTUAL_BATTERY); } -#endif diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index a055e7d548..df827c9c3f 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -27,11 +27,6 @@ #error Must define a VARIANT_KUKUI_BATTERY #endif /* VARIANT_KUKUI_BATTERY */ -#ifndef VARIANT_KUKUI_BATTERY_SMART -#define CONFIG_I2C_VIRTUAL_BATTERY -#define CONFIG_I2C_PASSTHRU_RESTRICTED -#endif - /* * Variant charger defines, pick one: * VARIANT_KUKUI_CHARGER_MT6370 @@ -100,6 +95,8 @@ #undef CONFIG_HIBERNATE #define CONFIG_I2C #define CONFIG_I2C_MASTER +#define CONFIG_I2C_VIRTUAL_BATTERY +#define CONFIG_I2C_PASSTHRU_RESTRICTED #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE #define CONFIG_POWER_COMMON diff --git a/board/damu/board.h b/board/damu/board.h index 98374b9a61..8a1e9ad303 100644 --- a/board/damu/board.h +++ b/board/damu/board.h @@ -64,6 +64,7 @@ #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER board_get_charger_i2c() #define I2C_PORT_IO_EXPANDER_IT8801 1 +#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h index d590a163e3..6f622c5bf0 100644 --- a/board/jacuzzi/board.h +++ b/board/jacuzzi/board.h @@ -64,6 +64,7 @@ #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER board_get_charger_i2c() #define I2C_PORT_IO_EXPANDER_IT8801 1 +#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ diff --git a/board/kappa/board.h b/board/kappa/board.h index e186f48964..33684a811a 100644 --- a/board/kappa/board.h +++ b/board/kappa/board.h @@ -64,6 +64,7 @@ #define I2C_PORT_BATTERY 1 #define I2C_PORT_CHARGER board_get_charger_i2c() #define I2C_PORT_IO_EXPANDER_IT8801 1 +#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ diff --git a/board/kodama/board.h b/board/kodama/board.h index b73ee6e9bc..c51ebb628b 100644 --- a/board/kodama/board.h +++ b/board/kodama/board.h @@ -57,6 +57,7 @@ #define I2C_PORT_TCPC0 0 #define I2C_PORT_USB_MUX 0 #define I2C_PORT_BATTERY 1 +#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY #define I2C_PORT_ACCEL 1 /* Define the host events which are allowed to wakeup AP in S3. */ |