diff options
| author | Keith Short <keithshort@chromium.org> | 2019-11-02 10:56:25 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-10 21:14:51 +0000 |
| commit | 332df8a34bc5dc86c76eca6c1e6b5507bcb4a672 (patch) | |
| tree | cb8f6d07c3d24b30596c66c2fedb867bba335e2e | |
| parent | a77d3db306dcf1a29f8c073922d3f104a074928d (diff) | |
| download | chrome-ec-332df8a34bc5dc86c76eca6c1e6b5507bcb4a672.tar.gz | |
volteer: add charger support
Configure ISL9241 charger on Volteer.
BUG=b:140557020
BRANCH=none
TEST=make buildall
Change-Id: I96f379cbb2adb7d46a79c9d177930e1ff4e0fa63
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1896649
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | baseboard/volteer/baseboard.c | 16 | ||||
| -rw-r--r-- | baseboard/volteer/baseboard.h | 7 | ||||
| -rw-r--r-- | board/volteer/ec.tasklist | 1 |
3 files changed, 8 insertions, 16 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index d79268c36a..d51dd7be7d 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -141,19 +141,3 @@ const struct pwm_t pwm_channels[] = { }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/* Stub out battery and charging functions to compile common LED code. - * TODO(b/140557020): Define these for real. - */ -#ifdef CONFIG_CHARGER -#error "Write real definitions for charger and battery functions." -#endif -enum charge_state charge_get_state(void) -{ - return PWR_STATE_UNCHANGE; -} - -int charge_get_percent(void) -{ - return 0; -} diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index a7736f4063..9c638577c2 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -64,6 +64,12 @@ /* Sensors */ /* Common charger defines */ +#define CONFIG_CHARGER +#define CONFIG_CHARGER_DISCHARGE_ON_AC +#define CONFIG_CHARGER_INPUT_CURRENT 512 +#define CONFIG_CHARGER_ISL9241 +#define CONFIG_CHARGER_SENSE_RESISTOR 10 +#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Common battery defines */ #define CONFIG_BATTERY_SMART @@ -85,6 +91,7 @@ #define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 #define I2C_PORT_BATTERY I2C_PORT_POWER +#define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 #define CONFIG_I2C_MASTER diff --git a/board/volteer/ec.tasklist b/board/volteer/ec.tasklist index ca22534cf4..ebb4205d6c 100644 --- a/board/volteer/ec.tasklist +++ b/board/volteer/ec.tasklist @@ -9,6 +9,7 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ |