diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2014-08-07 12:02:26 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-26 00:26:49 +0100 |
| commit | 3760272fb9639db22f54f54e2c32849720affde0 (patch) | |
| tree | 17dcad590bd77cfaa12ef7db718911af7db28807 /src/mainboard | |
| parent | bd2b59cf2bda89f5f01b0f1c58093944589a0a03 (diff) | |
| download | coreboot-3760272fb9639db22f54f54e2c32849720affde0.tar.xz | |
Restore name of the function reading tertiary GPIO states
The name was changed due to review comments misunderstanding, it
should be restored to properly convey what the function does.
BUG=chrome-os-partner:30489
TEST=verified that Storm still properly reports board ID
Change-Id: Iba33cf837e137424bfac970b0c9764d26786be9c
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: c0fff28c6ebf255cb9cf9dfe4c961d7a25bb13ff
Original-Change-Id: I4bd63f29afbfaf9f3e3e78602564eb52f63cc487
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/211413
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8979
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/nyan_big/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_blaze/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/storm/boardid.c | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c index c79af45812..3a22dede45 100644 --- a/src/mainboard/google/nyan_big/boardid.c +++ b/src/mainboard/google/nyan_big/boardid.c @@ -30,7 +30,7 @@ uint8_t board_id(void) if (id < 0) { gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)}; - id = gpio_board_id(gpio, ARRAY_SIZE(gpio), 0); + id = gpio_get_in_tristate_values(gpio, ARRAY_SIZE(gpio), 0); printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id); } diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c index c79af45812..3a22dede45 100644 --- a/src/mainboard/google/nyan_blaze/boardid.c +++ b/src/mainboard/google/nyan_blaze/boardid.c @@ -30,7 +30,7 @@ uint8_t board_id(void) if (id < 0) { gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)}; - id = gpio_board_id(gpio, ARRAY_SIZE(gpio), 0); + id = gpio_get_in_tristate_values(gpio, ARRAY_SIZE(gpio), 0); printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id); } diff --git a/src/mainboard/google/storm/boardid.c b/src/mainboard/google/storm/boardid.c index 7cbb92a701..c4a1af3da8 100644 --- a/src/mainboard/google/storm/boardid.c +++ b/src/mainboard/google/storm/boardid.c @@ -25,8 +25,9 @@ /* * Storm boards dedicate to the board ID three GPIOs in tertiary mode: 29, 30 * and 68. On proto0 GPIO68 is used and tied low, so it reads as 'zero' by - * gpio_board_id(), whereas the other two pins are not connected and read as - * 'two'. This results in gpio_board_id() returning 8 on proto0. + * gpio_get_in_tristate_values(), whereas the other two pins are not connected + * and read as 'two'. This results in gpio_get_in_tristate_values() returning + * 8 on proto0. * * Three tertitiary signals could represent 27 different values. To make * calculated board ID value continuous and starting at zero, offset the @@ -42,7 +43,8 @@ uint8_t board_id(void) gpio_t hw_rev_gpios[] = {68, 30, 29}; int offset = 19; - bid = gpio_board_id(hw_rev_gpios, ARRAY_SIZE(hw_rev_gpios), 1); + bid = gpio_get_in_tristate_values(hw_rev_gpios, + ARRAY_SIZE(hw_rev_gpios), 1); bid = (bid + offset) % 27; printk(BIOS_INFO, "Board ID %d\n", bid); |