diff options
| author | Philip Chen <philipchen@google.com> | 2018-04-06 18:03:12 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-04-09 05:20:14 +0000 |
| commit | bce51361c76aa480e5cc91f50afbdda14f61489d (patch) | |
| tree | 97e6a81624bec64af0f48863fbbaf1044697fe89 | |
| parent | 63e83f025d8d30a01154a5007ff1728b07d6c882 (diff) | |
| download | chrome-ec-bce51361c76aa480e5cc91f50afbdda14f61489d.tar.gz | |
nautilus: Support tristate board id strapping pin
With 3 binary strapping pins, we only have 7 available board ids:
000, 001, 010, 011, 100, 101, 110, 111.
Let's make the MSB of board id tristate. So we can have 4 more
board ids to use:
Z00, Z01, Z10, Z11.
BUG=b:77731277
BRANCH=poppy
TEST=build nautilus
Change-Id: I7aebb89437d2ccb9eea6c477155b25d964983232
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1001493
Reviewed-by: Philip Chen <philipchen@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
| -rw-r--r-- | board/nautilus/board.c | 28 | ||||
| -rw-r--r-- | board/nautilus/board.h | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/board/nautilus/board.c b/board/nautilus/board.c index 6503225c83..0f39bbf9b7 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -570,6 +570,34 @@ void board_hibernate(void) ; } +int board_get_version(void) +{ + static int ver = -1; + uint8_t id3; + + if (ver != -1) + return ver; + + ver = 0; + + /* First 2 strappings are binary. */ + if (gpio_get_level(GPIO_BOARD_VERSION1)) + ver |= 0x01; + if (gpio_get_level(GPIO_BOARD_VERSION2)) + ver |= 0x02; + + /* + * The 3rd strapping pin is tristate. + * id3 = 2 if Hi-Z, id3 = 1 if high, and id3 = 0 if low. + */ + id3 = gpio_get_ternary(GPIO_BOARD_VERSION3); + ver |= id3 * 0x04; + + CPRINTS("Board ID = %d", ver); + + return ver; +} + /* Lid Sensor mutex */ static struct mutex g_lid_mutex; static struct mutex g_base_mutex; diff --git a/board/nautilus/board.h b/board/nautilus/board.h index 997ebfbb0f..f16b37cbb2 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -12,6 +12,7 @@ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID #define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_SPECIFIC_VERSION #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL #define CONFIG_DPTF |