diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-06-26 09:17:42 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-06-29 17:50:16 -0700 |
| commit | 441e1a0cc5f1de0842b843f720974a75c16d6e4e (patch) | |
| tree | a36553d6dad31cca0c44178927008a27bdef2a98 | |
| parent | 63bad07288d96a9595fd0a0f97727fff10aedb55 (diff) | |
| download | chrome-ec-441e1a0cc5f1de0842b843f720974a75c16d6e4e.tar.gz | |
Nami: configure motion sensors for board variants early
This change makes motion sensor configured for board variants earlier.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=none
BRANCH=none
TEST=Verify accelinfo outputs are expected when lid is moved on Sona
Change-Id: I4709273ba412c4685b1037e0e34c3fedeb3f4dbf
Reviewed-on: https://chromium-review.googlesource.com/1115202
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | board/nami/board.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index 5dd7763d11..5ffe123047 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -730,6 +730,18 @@ static void board_chipset_suspend(void) } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); +static void setup_motion_sensors(void) +{ + if (oem != PROJECT_NAMI) + /* Only Nami has ALS */ + motion_sensor_count = ARRAY_SIZE(motion_sensors) - 1; + if (oem == PROJECT_AKALI) { + motion_sensors[LID_ACCEL] = lid_accel_1; + motion_sensors[BASE_ACCEL].rot_standard_ref = NULL; + motion_sensors[BASE_GYRO].rot_standard_ref = NULL; + } +} + static void setup_fans(void) { if (oem == PROJECT_SONA) @@ -761,22 +773,12 @@ static void cbi_init(void) /* Previous boards have GPIO42 connected to TP_INT_CONN */ gpio_set_flags(GPIO_USB2_ID, GPIO_INPUT); + setup_motion_sensors(); + setup_fans(); } DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); -static void setup_motion_sensors(void) -{ - if (oem != PROJECT_NAMI) - /* Only Nami has ALS */ - motion_sensor_count = ARRAY_SIZE(motion_sensors) - 1; - if (oem == PROJECT_AKALI) { - motion_sensors[LID_ACCEL] = lid_accel_1; - motion_sensors[BASE_ACCEL].rot_standard_ref = NULL; - motion_sensors[BASE_GYRO].rot_standard_ref = NULL; - } -} - static void board_init(void) { int reg; @@ -811,8 +813,6 @@ static void board_init(void) /* Enable Gyro interrupt for BMI160 */ gpio_enable_interrupt(GPIO_ACCELGYRO3_INT_L); - - setup_motion_sensors(); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); |