From 2e1f65545f7ee826322aef6a586a2580a23db775 Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Sat, 23 Mar 2019 12:41:04 +0800 Subject: chromeos: update old boards to use lb_add_gpios notation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of manually filling out the lb_gpios struct, use the newer lb_add_gpios notation, which is more compact and less error-prone. BUG=b:124141368 TEST=util/lint/checkpatch.pl -g origin/master..HEAD TEST=util/abuild/abuild -B -e -y -c 50 -p none -x BRANCH=none Change-Id: I90795f32be5de881c94519933f36127098c184df Signed-off-by: Joel Kitching Reviewed-on: https://review.coreboot.org/c/coreboot/+/32031 Reviewed-by: Kyösti Mälkki Reviewed-by: Simon Glass Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/mainboard/google/stout/chromeos.c | 63 ++++++++++++----------------------- 1 file changed, 22 insertions(+), 41 deletions(-) (limited to 'src/mainboard/google/stout/chromeos.c') diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c index d366e40822..015e0aad32 100644 --- a/src/mainboard/google/stout/chromeos.c +++ b/src/mainboard/google/stout/chromeos.c @@ -29,49 +29,30 @@ #if ENV_RAMSTAGE #include -#define GPIO_COUNT 7 - void fill_lb_gpios(struct lb_gpios *gpios) { - gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio)); - gpios->count = GPIO_COUNT; - - /* Write Protect: GPIO7 */ - gpios->gpios[0].port = 7; - gpios->gpios[0].polarity = ACTIVE_LOW; - gpios->gpios[0].value = !get_write_protect_state(); - strncpy((char *)gpios->gpios[0].name,"write protect", - GPIO_MAX_NAME_LENGTH); - - /* Recovery: Virtual switch */ - gpios->gpios[1].port = -1; - 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 Switch: Virtual switch */ - gpios->gpios[3].port = -1; - gpios->gpios[3].polarity = ACTIVE_HIGH; - gpios->gpios[3].value = get_lid_switch(); - strncpy((char *)gpios->gpios[3].name,"lid", GPIO_MAX_NAME_LENGTH); - - /* Power Button: Virtual switch */ - gpios->gpios[4].port = -1; - gpios->gpios[4].polarity = ACTIVE_HIGH; - gpios->gpios[4].value = 0; /* Hard-code to de-asserted */ - strncpy((char *)gpios->gpios[4].name,"power", GPIO_MAX_NAME_LENGTH); - - /* Was VGA Option ROM loaded? */ - 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); - - /* EC is in RW mode when it isn't in recovery mode. */ - gpios->gpios[6].port = -1; - gpios->gpios[6].polarity = ACTIVE_HIGH; - gpios->gpios[6].value = !get_recovery_mode_switch(); - strncpy((char *)gpios->gpios[6].name,"ec_in_rw", GPIO_MAX_NAME_LENGTH); + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: GPIO7 */ + {7, ACTIVE_LOW, !get_write_protect_state(), "write protect"}, + + /* Recovery: Virtual switch */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, + + /* Lid Switch: Virtual switch */ + {-1, ACTIVE_HIGH, get_lid_switch(), "lid"}, + + /* Power Button: Virtual switch */ + /* Hard-code value to de-asserted */ + {-1, ACTIVE_HIGH, 0, "power"}, + + /* Was VGA Option ROM loaded? */ + /* -1 indicates that this is a pseudo GPIO */ + {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"}, + + /* EC is in RW mode when it isn't in recovery mode. */ + {-1, ACTIVE_HIGH, !get_recovery_mode_switch(), "ec_in_rw"} + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } #endif -- cgit v1.2.3