From a6ea0bc7f58b6b754f848a3b677f3c441397431c Mon Sep 17 00:00:00 2001 From: David Huang Date: Thu, 4 Feb 2021 02:11:14 +0000 Subject: Reland "aleena: Add detect accel/gyro sensor in HOOK_INIT" This reverts commit e5fa7fc82639d619b7a53db6b8b94117c857014e. Reason for revert: Add include "adc.h" to fix build error. Need this change when sysjump rw and make sure ec get correct sku_id from adc. Original change's description: > Revert "aleena: Add detect accel/gyro sensor in HOOK_INIT" > > This reverts commit 103e253e60bb6e37278eb13ac880f172d6941358. > > Reason for revert: build fails on firmware-grunt-11031.B branch: > board/aleena/board.c:163:204: error: 'HOOK_PRIO_INIT_ADC' undeclared here (not in a function) > > Original change's description: > > aleena: Add detect accel/gyro sensor in HOOK_INIT > > > > Add detect accel/gyro sensor in HOOK_INIT for sysjump rw. > > Use "HOOK_PRIO_INIT_ADC + 2" For sku_id checking. > > And make sure detect sensor when chipset power on. > > > > BUG=none > > BRANCH=grunt > > TEST=sysjump ro/rw to check motionsense data. > > > > Signed-off-by: David Huang > > > > Change-Id: I143cde2ab3028ec5658acd16fdb6ec6aae710ef6 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2655305 > > Tested-by: David Huang > > Auto-Submit: David Huang > > Reviewed-by: YH Lin > > Reviewed-by: Keith Short > > Commit-Queue: David Huang > > (cherry picked from commit 8801fd7768c8b8436bd0282af71cdd449257c08a) > > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2662223 > > Commit-Queue: Keith Short > > Bug: none > Change-Id: I2cf8d24b2a41f715293b4a08ef11833e2320ce73 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2674380 > Reviewed-by: Edward Hill > Commit-Queue: Edward Hill > Tested-by: Edward Hill Bug: none Change-Id: Ic981032a15ec87ec611fd62ccc7bc9c8996cde66 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2673584 Tested-by: David Huang Auto-Submit: David Huang Reviewed-by: Edward Hill Commit-Queue: Edward Hill --- board/aleena/board.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/aleena/board.c b/board/aleena/board.c index 9939200025..186f9ddcc3 100644 --- a/board/aleena/board.c +++ b/board/aleena/board.c @@ -5,6 +5,7 @@ /* Aleena board-specific configuration */ +#include "adc.h" #include "button.h" #include "driver/accelgyro_bmi160.h" #include "console.h" @@ -137,6 +138,8 @@ static void board_detect_motionsensor(void) int ret; int val; + if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + return; if (base_accelgyro_config != BASE_GYRO_NONE) return; @@ -158,6 +161,7 @@ static void board_detect_motionsensor(void) } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_detect_motionsensor, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_INIT, board_detect_motionsensor, HOOK_PRIO_INIT_ADC + 2); void board_update_sensor_config_from_sku(void) { -- cgit v1.2.1