diff options
| author | David Huang <david.huang@quanta.corp-partner.google.com> | 2021-02-04 02:11:14 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-04 04:05:36 +0000 |
| commit | a6ea0bc7f58b6b754f848a3b677f3c441397431c (patch) | |
| tree | ffb6f57d5b74992f9c5f90a4f6ff9b83bd95deb4 | |
| parent | e5fa7fc82639d619b7a53db6b8b94117c857014e (diff) | |
| download | chrome-ec-a6ea0bc7f58b6b754f848a3b677f3c441397431c.tar.gz | |
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 <david.huang@quanta.corp-partner.google.com>
> >
> > Change-Id: I143cde2ab3028ec5658acd16fdb6ec6aae710ef6
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2655305
> > Tested-by: David Huang <david.huang@quanta.corp-partner.google.com>
> > Auto-Submit: David Huang <david.huang@quanta.corp-partner.google.com>
> > Reviewed-by: YH Lin <yueherngl@chromium.org>
> > Reviewed-by: Keith Short <keithshort@chromium.org>
> > Commit-Queue: David Huang <david.huang@quanta.corp-partner.google.com>
> > (cherry picked from commit 8801fd7768c8b8436bd0282af71cdd449257c08a)
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2662223
> > Commit-Queue: Keith Short <keithshort@chromium.org>
>
> Bug: none
> Change-Id: I2cf8d24b2a41f715293b4a08ef11833e2320ce73
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2674380
> Reviewed-by: Edward Hill <ecgh@chromium.org>
> Commit-Queue: Edward Hill <ecgh@chromium.org>
> Tested-by: Edward Hill <ecgh@chromium.org>
Bug: none
Change-Id: Ic981032a15ec87ec611fd62ccc7bc9c8996cde66
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2673584
Tested-by: David Huang <david.huang@quanta.corp-partner.google.com>
Auto-Submit: David Huang <david.huang@quanta.corp-partner.google.com>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | board/aleena/board.c | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |