1 files changed, 20 insertions, 35 deletions

diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index 335f1f7f79..5156404ab7 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -22,43 +22,28 @@
 #ifndef __PRE_RAM__
 #include <boot/coreboot_tables.h>
 
-#define GPIO_COUNT	6
-
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
-	gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio));
-	gpios->count = GPIO_COUNT;
-
-	/* Write Protect: GPIO57 = PCH_SPI_WP_D */
-	gpios->gpios[0].port = 57;
-	gpios->gpios[0].polarity = ACTIVE_HIGH;
-	gpios->gpios[0].value = get_write_protect_state();
-	strncpy((char *)gpios->gpios[0].name,"write protect",
-							GPIO_MAX_NAME_LENGTH);
-	/* Recovery: the "switch" comes from the EC */
-	gpios->gpios[1].port = -1; /* Indicate that this is a pseudo GPIO */
-	gpios->gpios[1].polarity = ACTIVE_HIGH;
-	gpios->gpios[1].value = get_recovery_mode_switch();
-	strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH);
-
-	/* Lid: the "switch" comes from the EC */
-	gpios->gpios[2].port = -1;
-	gpios->gpios[2].polarity = ACTIVE_HIGH;
-	gpios->gpios[2].value = get_lid_switch();
-	strncpy((char *)gpios->gpios[2].name,"lid", GPIO_MAX_NAME_LENGTH);
-
-	/* Power Button: hard-coded as not pressed; we'll detect later presses
-	 * via SMI. */
-	gpios->gpios[3].port = -1;
-	gpios->gpios[3].polarity = ACTIVE_HIGH;
-	gpios->gpios[3].value = 0;
-	strncpy((char *)gpios->gpios[3].name,"power", GPIO_MAX_NAME_LENGTH);
-
-	/* Did we load the VGA Option ROM? */
-	gpios->gpios[5].port = -1; /* Indicate that this is a pseudo GPIO */
-	gpios->gpios[5].polarity = ACTIVE_HIGH;
-	gpios->gpios[5].value = gfx_get_init_done();
-	strncpy((char *)gpios->gpios[5].name,"oprom", GPIO_MAX_NAME_LENGTH);
+	struct lb_gpio chromeos_gpios[] = {
+		/* Write Protect: GPIO57 = PCH_SPI_WP_D */
+		{57, ACTIVE_HIGH, get_write_protect_state(), "write protect"},
+
+		/* Recovery: the "switch" comes from the EC */
+		/* -1 indicates that this is a pseudo GPIO */
+		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
+
+		/* Lid: the "switch" comes from the EC */
+		{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
+
+		/* Power Button: hard-coded as not pressed; we'll detect later
+		 * presses via SMI. */
+		{-1, ACTIVE_HIGH, 0, "power"},
+
+		/* Did we load the VGA Option ROM? */
+		/* -1 indicates that this is a pseudo GPIO */
+		{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
+	};
+	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
 #endif