GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Vadim Bendebury 2014-08-07 12:02:26 -07:00 committed by Patrick Georgi
parent bd2b59cf2b
commit 3760272fb9
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/gpiolib.h
View File

@ -32,7 +32,7 @@ typedef unsigned gpio_t;
* included multiplied by 3^gpio_num, resulting in a true tertiary value. * included multiplied by 3^gpio_num, resulting in a true tertiary value.
* *
*/ */
int gpio_board_id(gpio_t gpio[], int num_gpio, int tertiary); int gpio_get_in_tristate_values(gpio_t gpio[], int num_gpio, int tertiary);
/* /*
* The following functions are not provided by the common library, but must be * The following functions are not provided by the common library, but must be

2
src/lib/tristate_gpios.c
View File

@ -20,7 +20,7 @@
#include <delay.h> #include <delay.h>
#include <gpiolib.h> #include <gpiolib.h>
int gpio_board_id(gpio_t gpio[], int num_gpio, int tertiary) int gpio_get_in_tristate_values(gpio_t gpio[], int num_gpio, int tertiary)
{ {
/* /*
* GPIOs which are tied to stronger external pull up or pull down * GPIOs which are tied to stronger external pull up or pull down

2
src/mainboard/google/nyan_big/boardid.c
View File

@ -30,7 +30,7 @@ uint8_t board_id(void)
if (id < 0) { if (id < 0) {
gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)}; 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); printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id);
} }

2
src/mainboard/google/nyan_blaze/boardid.c
View File

@ -30,7 +30,7 @@ uint8_t board_id(void)
if (id < 0) { if (id < 0) {
gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)}; 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); printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id);
} }

8
src/mainboard/google/storm/boardid.c
View File

@ -25,8 +25,9 @@
/* /*
* Storm boards dedicate to the board ID three GPIOs in tertiary mode: 29, 30 * 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 * 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 * gpio_get_in_tristate_values(), whereas the other two pins are not connected
* 'two'. This results in gpio_board_id() returning 8 on proto0. * 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 * Three tertitiary signals could represent 27 different values. To make
* calculated board ID value continuous and starting at zero, offset the * 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}; gpio_t hw_rev_gpios[] = {68, 30, 29};
int offset = 19; 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; bid = (bid + offset) % 27;
printk(BIOS_INFO, "Board ID %d\n", bid); printk(BIOS_INFO, "Board ID %d\n", bid);