diff options
| -rw-r--r-- | src/include/gpiolib.h | 2 | ||||
| -rw-r--r-- | src/lib/tristate_gpios.c | 2 | ||||
| -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 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/include/gpiolib.h b/src/include/gpiolib.h index daec3b66bd..850a661559 100644 --- a/src/include/gpiolib.h +++ b/src/include/gpiolib.h @@ -32,7 +32,7 @@ typedef unsigned gpio_t; * 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 diff --git a/src/lib/tristate_gpios.c b/src/lib/tristate_gpios.c index b1ebbc0f71..49f060c9c2 100644 --- a/src/lib/tristate_gpios.c +++ b/src/lib/tristate_gpios.c @@ -20,7 +20,7 @@ #include <delay.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 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); |