diff options
| author | Craig Hesling <hesling@chromium.org> | 2021-08-01 15:35:25 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-04 21:33:58 +0000 |
| commit | 7b5eaddf715ca56ff7f2b3761ce0ea003d2d3ac1 (patch) | |
| tree | 80c0f16e36e4f36aa51940f79a57a8ec82efb7a7 /board/nocturne_fp | |
| parent | 04e4f50c0ecfaa006069bd0978a64ede66d33439 (diff) | |
| download | chrome-ec-7b5eaddf715ca56ff7f2b3761ce0ea003d2d3ac1.tar.gz | |
Revert "Dartmonkey: Implement get_fp_transport_type"
This reverts commit b4125247f556650771bf6c92ccf612de382ad221.
The commit being reverted introduces an issue for legacy
dartmonkey devices, like nami.
BRANCH=none
BUG=b:195235710
TEST=# Flash to bard (nami) device and check that cros-ec can bind.
# See bug for more details.
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I4aa6d0579ebb587f765cc1e4ab255a4a541e2240
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3066145
Reviewed-by: Jora Jacobi <jora@google.com>
Diffstat (limited to 'board/nocturne_fp')
| -rw-r--r-- | board/nocturne_fp/fpsensor_detect.c | 20 | ||||
| -rw-r--r-- | board/nocturne_fp/gpio.inc | 2 | ||||
| -rw-r--r-- | board/nocturne_fp/gpio_rw.inc | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/board/nocturne_fp/fpsensor_detect.c b/board/nocturne_fp/fpsensor_detect.c index 638b5fbfe0..5a4b95e64c 100644 --- a/board/nocturne_fp/fpsensor_detect.c +++ b/board/nocturne_fp/fpsensor_detect.c @@ -4,26 +4,8 @@ */ #include "fpsensor_detect.h" -#include "gpio.h" -#include "timer.h" enum fp_transport_type get_fp_transport_type(void) { - enum fp_transport_type ret; - - gpio_set_level(GPIO_DIVIDER_HIGHSIDE, 1); - usleep(1); - switch (gpio_get_level(GPIO_TRANSPORT_SEL)) { - case 0: - ret = FP_TRANSPORT_TYPE_UART; - break; - case 1: - ret = FP_TRANSPORT_TYPE_SPI; - break; - default: - ret = FP_TRANSPORT_TYPE_UNKNOWN; - break; - } - gpio_set_level(GPIO_DIVIDER_HIGHSIDE, 0); - return ret; + return FP_TRANSPORT_TYPE_SPI; } diff --git a/board/nocturne_fp/gpio.inc b/board/nocturne_fp/gpio.inc index f10ddde389..7e90ef0da4 100644 --- a/board/nocturne_fp/gpio.inc +++ b/board/nocturne_fp/gpio.inc @@ -11,11 +11,9 @@ GPIO_INT(SPI1_NSS, PIN(A, 4), GPIO_INPUT, spi_event) #ifndef APPLY_RESET_LOOP_FIX GPIO(WP, PIN(B, 7), GPIO_INPUT) #endif -GPIO(TRANSPORT_SEL, PIN(B, 1), GPIO_INPUT) /* Outputs */ GPIO(EC_INT_L, PIN(A, 1), GPIO_OUT_HIGH) -GPIO(DIVIDER_HIGHSIDE, PIN(B, 8), GPIO_OUT_LOW) UNIMPLEMENTED(ENTERING_RW) diff --git a/board/nocturne_fp/gpio_rw.inc b/board/nocturne_fp/gpio_rw.inc index 61cd3e17e2..65036abe14 100644 --- a/board/nocturne_fp/gpio_rw.inc +++ b/board/nocturne_fp/gpio_rw.inc @@ -30,6 +30,7 @@ GPIO(PCH_SLP_SUS_L, PIN(D, 3), GPIO_INPUT) GPIO(FP_SPI_SEL, PIN(E, 1), GPIO_INPUT | GPIO_PULL_UP) /* Outputs */ +GPIO(DIVIDER_HIGHSIDE, PIN(B, 8), GPIO_OUT_LOW) GPIO(FP_RST_ODL, PIN(E, 0), GPIO_OUT_HIGH) GPIO(SPI4_NSS, PIN(E, 4), GPIO_OUT_HIGH) GPIO(SPI4_ALT_NSS, PIN(E, 11), GPIO_OUT_HIGH) |