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/intel/baskingridge/chromeos.c | 56 ++++++++--------------------- 1 file changed, 15 insertions(+), 41 deletions(-) (limited to 'src/mainboard/intel/baskingridge/chromeos.c') diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c index 1c62e5e0eb..875578fed4 100644 --- a/src/mainboard/intel/baskingridge/chromeos.c +++ b/src/mainboard/intel/baskingridge/chromeos.c @@ -26,52 +26,25 @@ #if ENV_RAMSTAGE #include -#define GPIO_COUNT 6 - void fill_lb_gpios(struct lb_gpios *gpios) { - struct device *dev = pcidev_on_root(0x1f, 0); - u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe; - - if (!gpio_base) - return; - - u32 gp_lvl = inl(gpio_base + GP_LVL); - u32 gp_lvl3 = inl(gpio_base + GP_LVL3); - - gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio)); - gpios->count = GPIO_COUNT; - - /* Write Protect: GPIO22 */ - gpios->gpios[0].port = 0; - gpios->gpios[0].polarity = ACTIVE_LOW; - gpios->gpios[0].value = (gp_lvl >> 22) & 1; - strncpy((char *)gpios->gpios[0].name,"write protect", - GPIO_MAX_NAME_LENGTH); + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: GPIO22 */ + {0, ACTIVE_LOW, get_write_protect_state(), "write protect"}, - /* Recovery: GPIO69 - SV_DETECT - J8E3 (silkscreen: J8E2) */ - gpios->gpios[1].port = 69; - gpios->gpios[1].polarity = ACTIVE_HIGH; - gpios->gpios[1].value = (gp_lvl3 >> (69-64)) & 1; - strncpy((char *)gpios->gpios[1].name,"recovery", GPIO_MAX_NAME_LENGTH); + /* Recovery: GPIO69 - SV_DETECT - J8E3 (silkscreen: J8E2) */ + {69, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, - /* Hard code the lid switch GPIO to open. */ - gpios->gpios[3].port = -1; - gpios->gpios[3].polarity = ACTIVE_HIGH; - gpios->gpios[3].value = 1; - strncpy((char *)gpios->gpios[3].name,"lid", GPIO_MAX_NAME_LENGTH); + /* Hard code the lid switch GPIO to open. */ + {-1, ACTIVE_HIGH, 1, "lid"}, - /* Power Button */ - gpios->gpios[4].port = -1; - gpios->gpios[4].polarity = ACTIVE_HIGH; - gpios->gpios[4].value = 0; - strncpy((char *)gpios->gpios[4].name,"power", GPIO_MAX_NAME_LENGTH); + /* Power Button */ + {-1, ACTIVE_HIGH, 0, "power"}, - /* Did we load the VGA option ROM? */ - gpios->gpios[5].port = -1; - 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); + /* Did we load the VGA option ROM? */ + {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } #endif @@ -86,7 +59,8 @@ int get_recovery_mode_switch(void) int get_write_protect_state(void) { - return 0; + /* Write protect is active low, so invert it here */ + return !get_gpio(22); } static const struct cros_gpio cros_gpios[] = { -- cgit v1.2.3