diff options
| author | Bhanu Prakash Maiya <bhanumaiya@google.com> | 2020-05-09 01:18:42 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-05 10:06:43 +0000 |
| commit | bc96d7077db615d849d398115af76b7b85f63e01 (patch) | |
| tree | 4ec4a54fd970d625ee7541615e013d0e1a50200a | |
| parent | 05a4c577abbcbe181f9b1b41ccc6d00ec282554a (diff) | |
| download | chrome-ec-bc96d7077db615d849d398115af76b7b85f63e01.tar.gz | |
fpsensor: cleanup multiple fp spi enable
BUG=b:147849609
BRANCH=none
TEST=1. make buildall -j
Change-Id: I35146070ec20a3605588792fc19595dc1c1ea3cf
Signed-off-by: Bhanu Prakash Maiya <bhanumaiya@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2191733
Tested-by: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Auto-Submit: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
| -rw-r--r-- | board/hatch_fp/board.c | 4 | ||||
| -rw-r--r-- | board/nocturne_fp/board.c | 4 | ||||
| -rw-r--r-- | board/nucleo-dartmonkey/board.c | 4 | ||||
| -rw-r--r-- | common/fpsensor/build.mk | 2 | ||||
| -rw-r--r-- | common/fpsensor/fpsensor.c | 6 |
5 files changed, 13 insertions, 7 deletions
diff --git a/board/hatch_fp/board.c b/board/hatch_fp/board.c index b7fed1ae58..d0afce3414 100644 --- a/board/hatch_fp/board.c +++ b/board/hatch_fp/board.c @@ -6,6 +6,7 @@ #include "common.h" #include "console.h" +#include "fpsensor_detect.h" #include "gpio.h" #include "hooks.h" #include "registers.h" @@ -86,6 +87,9 @@ static void board_init(void) { spi_configure(); + ccprints("TRANSPORT_SEL: %s", + fp_transport_type_to_str(get_fp_transport_type())); + /* Enable interrupt on PCH power signals */ gpio_enable_interrupt(GPIO_PCH_SLP_S3_L); gpio_enable_interrupt(GPIO_PCH_SLP_S0_L); diff --git a/board/nocturne_fp/board.c b/board/nocturne_fp/board.c index bae9936c61..c12003577f 100644 --- a/board/nocturne_fp/board.c +++ b/board/nocturne_fp/board.c @@ -6,6 +6,7 @@ #include "common.h" #include "console.h" +#include "fpsensor_detect.h" #include "gpio.h" #include "hooks.h" #include "registers.h" @@ -83,6 +84,9 @@ static void board_init(void) { spi_configure(); + ccprints("TRANSPORT_SEL: %s", + fp_transport_type_to_str(get_fp_transport_type())); + /* Enable interrupt on PCH power signals */ gpio_enable_interrupt(GPIO_PCH_SLP_S3_L); gpio_enable_interrupt(GPIO_PCH_SLP_S0_L); diff --git a/board/nucleo-dartmonkey/board.c b/board/nucleo-dartmonkey/board.c index da70b6610c..ea5a921aa7 100644 --- a/board/nucleo-dartmonkey/board.c +++ b/board/nucleo-dartmonkey/board.c @@ -5,6 +5,7 @@ #include "common.h" #include "console.h" +#include "fpsensor_detect.h" #include "gpio.h" #include "hooks.h" #include "registers.h" @@ -82,6 +83,9 @@ static void board_init(void) { spi_configure(); + ccprints("TRANSPORT_SEL: %s", + fp_transport_type_to_str(get_fp_transport_type())); + /* Enable interrupt on PCH power signals */ gpio_enable_interrupt(GPIO_PCH_SLP_S3_L); gpio_enable_interrupt(GPIO_PCH_SLP_S0_L); diff --git a/common/fpsensor/build.mk b/common/fpsensor/build.mk index 0a5ec373de..8ea6569ddd 100644 --- a/common/fpsensor/build.mk +++ b/common/fpsensor/build.mk @@ -10,4 +10,4 @@ _fpsensor_dir:=$(dir $(lastword $(MAKEFILE_LIST))) all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_state.o all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_crypto.o all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor.o -all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_detect_common.o +all-obj-$(HAS_TASK_CONSOLE)+=$(_fpsensor_dir)fpsensor_detect_common.o diff --git a/common/fpsensor/fpsensor.c b/common/fpsensor/fpsensor.c index dd228ade09..4a135b6d4b 100644 --- a/common/fpsensor/fpsensor.c +++ b/common/fpsensor/fpsensor.c @@ -200,12 +200,6 @@ void fp_task(void) { int timeout_us = -1; - /* configure the SPI controller (also ensure that CS_N is high) */ - gpio_config_module(MODULE_SPI_MASTER, 1); - spi_enable(CONFIG_SPI_FP_PORT, 1); - - CPRINTS("TRANSPORT_SEL: %s", - fp_transport_type_to_str(get_fp_transport_type())); CPRINTS("FP_SENSOR_SEL: %s", fp_sensor_type_to_str(get_fp_sensor_type())); |