diff options
| -rw-r--r-- | src/include/gpio.h | 4 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/lib/gpio.c (renamed from src/lib/tristate_gpios.c) | 10 | ||||
| -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/rush_ryu/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/storm/boardid.c | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/include/gpio.h b/src/include/gpio.h index b2a341dabc..e54b156ce7 100644 --- a/src/include/gpio.h +++ b/src/include/gpio.h @@ -37,12 +37,12 @@ void gpio_output(gpio_t gpio, int value); /* * Read the value presented by the set of GPIOs, when each pin is interpreted * as a base-3 digit (LOW = 0, HIGH = 1, Z/floating = 2). - * Example: X1 = Z, X2 = 1 -> gpio_get_tristates({GPIO(X1), GPIO(X2)}) = 5 + * Example: X1 = Z, X2 = 1 -> gpio_base3_value({GPIO(X1), GPIO(X2)}) = 5 * BASE3() from <base3.h> can generate numbers to compare the result to. * * gpio[]: pin positions to read. gpio[0] is less significant than gpio[1]. * num_gpio: number of pins to read. */ -int gpio_get_tristates(gpio_t gpio[], int num_gpio); +int gpio_base3_value(gpio_t gpio[], int num_gpio); #endif /* __SRC_INCLUDE_GPIO_H__ */ diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 079c855f68..0959359695 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -92,7 +92,7 @@ ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c ramstage-y += memrange.c ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c -ramstage-$(CONFIG_TERTIARY_BOARD_ID) += tristate_gpios.c +ramstage-$(CONFIG_TERTIARY_BOARD_ID) += gpio.c ramstage-$(CONFIG_GENERIC_UDELAY) += timer.c romstage-y += cbmem_common.c dynamic_cbmem.c diff --git a/src/lib/tristate_gpios.c b/src/lib/gpio.c index 0967a8f4be..3a646e0d1d 100644 --- a/src/lib/tristate_gpios.c +++ b/src/lib/gpio.c @@ -22,7 +22,7 @@ #include <delay.h> #include <gpio.h> -int gpio_get_tristates(gpio_t gpio[], int num_gpio) +int gpio_base3_value(gpio_t gpio[], int num_gpio) { /* * GPIOs which are tied to stronger external pull up or pull down @@ -36,7 +36,7 @@ int gpio_get_tristates(gpio_t gpio[], int num_gpio) static const char tristate_char[] = {[0] = '0', [1] = '1', [Z] = 'Z'}; int temp; int index; - int id = 0; + int result = 0; char value[num_gpio]; /* Enable internal pull up */ @@ -70,13 +70,13 @@ int gpio_get_tristates(gpio_t gpio[], int num_gpio) temp = gpio_get(gpio[index]); temp |= ((value[index] ^ temp) << 1); printk(BIOS_DEBUG, "%c ", tristate_char[temp]); - id = (id * 3) + temp; + result = (result * 3) + temp; } - printk(BIOS_DEBUG, "= %d\n", id); + printk(BIOS_DEBUG, "= %d\n", result); /* Disable pull up / pull down to conserve power */ for (index = 0; index < num_gpio; ++index) gpio_input(gpio[index]); - return id; + return result; } diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c index b420f5aca0..1905c79e16 100644 --- a/src/mainboard/google/nyan_big/boardid.c +++ b/src/mainboard/google/nyan_big/boardid.c @@ -29,7 +29,7 @@ uint8_t board_id(void) [1] = GPIO(T1), [0] = GPIO(Q3),}; /* Q3 is LSB */ if (id < 0) { - id = gpio_get_tristates(gpio, ARRAY_SIZE(gpio)); + id = gpio_base3_value(gpio, ARRAY_SIZE(gpio)); printk(BIOS_SPEW, "Board TRISTATE ID: %d.\n", id); } diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c index b420f5aca0..1905c79e16 100644 --- a/src/mainboard/google/nyan_blaze/boardid.c +++ b/src/mainboard/google/nyan_blaze/boardid.c @@ -29,7 +29,7 @@ uint8_t board_id(void) [1] = GPIO(T1), [0] = GPIO(Q3),}; /* Q3 is LSB */ if (id < 0) { - id = gpio_get_tristates(gpio, ARRAY_SIZE(gpio)); + id = gpio_base3_value(gpio, ARRAY_SIZE(gpio)); printk(BIOS_SPEW, "Board TRISTATE ID: %d.\n", id); } diff --git a/src/mainboard/google/rush_ryu/boardid.c b/src/mainboard/google/rush_ryu/boardid.c index 37f6292156..9c4d18407d 100644 --- a/src/mainboard/google/rush_ryu/boardid.c +++ b/src/mainboard/google/rush_ryu/boardid.c @@ -30,7 +30,7 @@ uint8_t board_id(void) if (id < 0) { gpio_t gpio[] = {[1] = BD_ID1, [0] = BD_ID0}; /* ID0 is LSB */ - id = gpio_get_tristates(gpio, ARRAY_SIZE(gpio)); + id = gpio_base3_value(gpio, ARRAY_SIZE(gpio)); } return id; diff --git a/src/mainboard/google/storm/boardid.c b/src/mainboard/google/storm/boardid.c index c32567e273..c4f54a5186 100644 --- a/src/mainboard/google/storm/boardid.c +++ b/src/mainboard/google/storm/boardid.c @@ -25,8 +25,8 @@ /* * 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_get_tristates(), whereas the other two pins are not connected - * and read as 'two'. This results in gpio_get_tristates() returning + * gpio_base3_value(), whereas the other two pins are not connected + * and read as 'two'. This results in gpio_base3_value() returning * 8 on proto0. * * Three tertitiary signals could represent 27 different values. To make @@ -45,7 +45,7 @@ static uint8_t get_board_id(void) gpio_t hw_rev_gpios[] = {[2] = 68, [1] = 30, [0] = 29}; /* 29 is LSB */ int offset = 19; - bid = gpio_get_tristates(hw_rev_gpios, ARRAY_SIZE(hw_rev_gpios)); + bid = gpio_base3_value(hw_rev_gpios, ARRAY_SIZE(hw_rev_gpios)); bid = (bid + offset) % 27; printk(BIOS_INFO, "Board ID %d\n", bid); |