diff options
| author | Philip Chen <philipchen@google.com> | 2017-06-05 14:08:48 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-06 17:09:27 -0700 |
| commit | aafff584ae4a9df771d2ef5f353265bd8cc4325d (patch) | |
| tree | b2057384b3a918d192e9deb759c6c7637d06bd6c /board/scarlet/board.c | |
| parent | d8036441ca85bdfbf6f8d3a8bd5547bf626d6f3d (diff) | |
| download | chrome-ec-aafff584ae4a9df771d2ef5f353265bd8cc4325d.tar.gz | |
scarlet: Adapt to the master branch
To port Scarlet from firmware-gru-8785.B to master, we need
some change in naming/definition of variables/functions.
BUG=b:62307687
CQ-DEPEND=CL:524034, CL:524973, CL:524981
BRANCH=gru
TEST=build image and boot Scarlet
Change-Id: I20c1a4f311c9250a3bf1a2a5b0c70dd0f7c7e45b
Reviewed-on: https://chromium-review.googlesource.com/524987
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/scarlet/board.c')
| -rw-r--r-- | board/scarlet/board.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 388a5b4a94..1ef6989768 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -18,7 +18,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" -#include "driver/charger/bd99955.h" +#include "driver/charger/bd9995x.h" #include "driver/tcpm/fusb302.h" #include "extpower.h" #include "gpio.h" @@ -178,7 +178,8 @@ uint16_t tcpc_get_alert_status(void) int board_set_active_charge_port(int charge_port) { - enum bd99955_charge_port bd99955_port; + enum bd9995x_charge_port bd9995x_port; + int bd9995x_port_select = 1; static int initialized; /* @@ -201,10 +202,11 @@ int board_set_active_charge_port(int charge_port) /* Don't charge from a source port */ if (board_vbus_source_enabled(charge_port)) return -1; - bd99955_port = BD99955_CHARGE_PORT_VBUS; + bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port); break; case CHARGE_PORT_NONE: - bd99955_port = BD99955_CHARGE_PORT_NONE; + bd9995x_port_select = 0; + bd9995x_port = BD9995X_CHARGE_PORT_BOTH; break; default: panic("Invalid charge port\n"); @@ -212,10 +214,11 @@ int board_set_active_charge_port(int charge_port) } initialized = 1; - return bd99955_select_input_port(bd99955_port); + return bd9995x_select_input_port(bd9995x_port, bd9995x_port_select); } -void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma) +void board_set_charge_limit(int port, int supplier, int charge_ma, + int max_ma, int charge_mv) { /* * Ignore lower charge ceiling on PD transition if our battery is @@ -230,7 +233,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma) } charge_set_input_current_limit(MAX(charge_ma, - CONFIG_CHARGER_INPUT_CURRENT)); + CONFIG_CHARGER_INPUT_CURRENT), charge_mv); } int extpower_is_present(void) @@ -242,7 +245,7 @@ int extpower_is_present(void) if (board_vbus_source_enabled(0)) return 0; else - return bd99955_is_vbus_provided(BD99955_CHARGE_PORT_VBUS); + return bd9995x_is_vbus_provided(BD9995X_CHARGE_PORT_VBUS); } int pd_snk_is_vbus_provided(int port) @@ -250,7 +253,7 @@ int pd_snk_is_vbus_provided(int port) if (port) panic("Invalid charge port\n"); - return bd99955_is_vbus_provided(BD99955_CHARGE_PORT_VBUS); + return bd9995x_is_vbus_provided(BD9995X_CHARGE_PORT_VBUS); } static void board_spi_enable(void) @@ -403,6 +406,8 @@ int board_get_version(void) /* Mutexes */ static struct mutex g_base_mutex; +struct bmi160_drv_data_t g_bmi160_data; + /* Matrix to rotate accelerometer into standard reference frame */ const matrix_3x3_t base_standard_ref = { { FLOAT_TO_FP(-1), 0, 0}, @@ -416,6 +421,8 @@ const matrix_3x3_t lid_standard_ref = { { 0, 0, FLOAT_TO_FP(1)} }; +struct bmp280_drv_data_t bmp280_drv_data; + struct motion_sensor_t motion_sensors[] = { /* * Note: bmi160: supports accelerometer and gyro sensor |