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/foster/chromeos.c | 47 ++++++++-------------------------- 1 file changed, 11 insertions(+), 36 deletions(-) (limited to 'src/mainboard/google/foster') diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c index 4cf2a858c0..024fd4ce7e 100644 --- a/src/mainboard/google/foster/chromeos.c +++ b/src/mainboard/google/foster/chromeos.c @@ -24,46 +24,21 @@ void fill_lb_gpios(struct lb_gpios *gpios) { - int count = 0; - /* TBD(twarren@nvidia.com): Any analogs for these on Foster-FFD? */ + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: active low */ + {-1, ACTIVE_LOW, get_write_protect_state(), "write protect"}, - /* Write Protect: active low */ - gpios->gpios[count].port = -1; - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = get_write_protect_state(); - strncpy((char *)gpios->gpios[count].name, "write protect", - GPIO_MAX_NAME_LENGTH); - count++; - - /* Recovery: active high */ - gpios->gpios[count].port = -1; - gpios->gpios[count].polarity = ACTIVE_HIGH; - gpios->gpios[count].value = get_recovery_mode_switch(); - strncpy((char *)gpios->gpios[count].name, "recovery", - GPIO_MAX_NAME_LENGTH); - count++; - - /* TODO: Power: active low / high depending on board id */ - gpios->gpios[count].port = GPIO(X5); - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = -1; - strncpy((char *)gpios->gpios[count].name, "power", - GPIO_MAX_NAME_LENGTH); - count++; - - /* TODO: Reset: active low (output) */ - gpios->gpios[count].port = GPIO(I5); - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = -1; - strncpy((char *)gpios->gpios[count].name, "reset", - GPIO_MAX_NAME_LENGTH); - count++; + /* Recovery: active high */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, - gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio)); - gpios->count = count; + /* TODO: Power: active low / high depending on board id */ + {GPIO(X5), ACTIVE_LOW, -1, "power"}, - printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size); + /* TODO: Reset: active low (output) */ + {GPIO(I5), ACTIVE_LOW, -1, "reset"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } int get_recovery_mode_switch(void) -- cgit v1.2.3