diff options
author | Joel Kitching <kitching@google.com> | 2019-03-23 12:41:04 +0800 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-27 08:21:01 +0000 |
commit | 2e1f65545f7ee826322aef6a586a2580a23db775 (patch) | |
tree | 9bb929c38b2b738a5fa4f517f185f7be9ff08304 /src/mainboard/google | |
parent | f7f41a663f11f57a463177d4f7c9df165830c821 (diff) | |
download | coreboot-2e1f65545f7ee826322aef6a586a2580a23db775.tar.xz |
chromeos: update old boards to use lb_add_gpios notation
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 <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32031
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r-- | src/mainboard/google/butterfly/chromeos.c | 65 | ||||
-rw-r--r-- | src/mainboard/google/daisy/chromeos.c | 47 | ||||
-rw-r--r-- | src/mainboard/google/foster/chromeos.c | 47 | ||||
-rw-r--r-- | src/mainboard/google/link/chromeos.c | 55 | ||||
-rw-r--r-- | src/mainboard/google/parrot/chromeos.c | 55 | ||||
-rw-r--r-- | src/mainboard/google/peach_pit/chromeos.c | 47 | ||||
-rw-r--r-- | src/mainboard/google/stout/chromeos.c | 63 |
7 files changed, 114 insertions, 265 deletions
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c index 11b28cde90..a956e2869b 100644 --- a/src/mainboard/google/butterfly/chromeos.c +++ b/src/mainboard/google/butterfly/chromeos.c @@ -33,53 +33,28 @@ #if ENV_RAMSTAGE #include <boot/coreboot_tables.h> -#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_config16(dev, GPIOBASE) & 0xfffe; - - int lidswitch = 0; - if (!gpio_base) - return; - - gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio)); - gpios->count = GPIO_COUNT; - - /* Write Protect: GPIO active Low */ - gpios->gpios[0].port = WP_GPIO; - 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 GPIO active high */ - 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 value from EC */ - 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); - printk(BIOS_DEBUG,"LID SWITCH FROM EC: %x\n", lidswitch); - - /* Power Button - Hardcode Low as power button may still be pressed - when read here.*/ - 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); - - /* 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); - + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: GPIO active Low */ + {WP_GPIO, ACTIVE_LOW, !get_write_protect_state(), + "write protect"}, + + /* Recovery: virtual GPIO active high */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, + + /* lid switch value from EC */ + {-1, ACTIVE_HIGH, get_lid_switch(), "lid"}, + + /* Power Button - Hardcode Low as power button may still be + * pressed when read here.*/ + {-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"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } #endif diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c index ae456b47aa..65139bb1ad 100644 --- a/src/mainboard/google/daisy/chromeos.c +++ b/src/mainboard/google/daisy/chromeos.c @@ -25,44 +25,21 @@ void fill_lb_gpios(struct lb_gpios *gpios) { - int count = 0; + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: active low (WP_GPIO) */ + {EXYNOS5_GPD1, ACTIVE_LOW, gpio_get_value(GPIO_D16), + "write protect"}, - /* Write Protect: active low */ - gpios->gpios[count].port = EXYNOS5_GPD1; - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = gpio_get_value(GPIO_D16); // WP_GPIO - strncpy((char *)gpios->gpios[count].name, "write protect", - GPIO_MAX_NAME_LENGTH); - count++; + /* Recovery: active low */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, - /* Recovery: active low */ - 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++; + /* Lid: active high (LID_GPIO) */ + {EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X35), "lid"}, - /* Lid: active high */ - gpios->gpios[count].port = EXYNOS5_GPX3; - gpios->gpios[count].polarity = ACTIVE_HIGH; - gpios->gpios[count].value = gpio_get_value(GPIO_X35); // LID_GPIO - strncpy((char *)gpios->gpios[count].name, "lid", GPIO_MAX_NAME_LENGTH); - count++; - - /* Power: virtual GPIO active low */ - gpios->gpios[count].port = EXYNOS5_GPX1; - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = - gpio_get_value(GPIO_X13); // POWER_GPIO - strncpy((char *)gpios->gpios[count].name, "power", - GPIO_MAX_NAME_LENGTH); - count++; - - gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio)); - gpios->count = count; - - printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size); + /* Power: virtual GPIO active low (POWER_GPIO) */ + {EXYNOS5_GPX1, ACTIVE_LOW, gpio_get_value(GPIO_X13), "power"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } int get_recovery_mode_switch(void) 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) 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 diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c index 1420bf584d..99fc76439b 100644 --- a/src/mainboard/google/parrot/chromeos.c +++ b/src/mainboard/google/parrot/chromeos.c @@ -30,50 +30,29 @@ #if ENV_RAMSTAGE #include <boot/coreboot_tables.h> -#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; u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1); - if (!gpio_base) - return; - - gpios->size = sizeof(*gpios) + (GPIO_COUNT * sizeof(struct lb_gpio)); - gpios->count = GPIO_COUNT; - - /* Write Protect: GPIO70 active high */ - gpios->gpios[0].port = 70; - 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 GPIO in the EC (Servo GPIO68 active low) */ - 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 GPIO active high (open). */ - gpios->gpios[3].port = 15; - 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 */ - gpios->gpios[4].port = 101; - gpios->gpios[4].polarity = ACTIVE_LOW; - gpios->gpios[4].value = (gen_pmcon_1 >> 9) & 1; - strncpy((char *)gpios->gpios[4].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: GPIO70 active high */ + {70, ACTIVE_LOW, !get_write_protect_state(), "write protect"}, + + /* Recovery: Virtual GPIO in the EC (Servo GPIO68 active low) */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, + + /* Lid switch GPIO active high (open). */ + {15, ACTIVE_HIGH, get_lid_switch(), "lid"}, + + /* Power Button */ + {101, ACTIVE_LOW, (gen_pmcon_1 >> 9) & 1, "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 diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c index e782986cf4..f507bd8d6b 100644 --- a/src/mainboard/google/peach_pit/chromeos.c +++ b/src/mainboard/google/peach_pit/chromeos.c @@ -25,44 +25,21 @@ void fill_lb_gpios(struct lb_gpios *gpios) { - int count = 0; + struct lb_gpio chromeos_gpios[] = { + /* Write Protect: active low (WP_GPIO) */ + {EXYNOS5_GPX3, ACTIVE_LOW, gpio_get_value(GPIO_X30), + "write protect"}, - /* Write Protect: active low */ - gpios->gpios[count].port = EXYNOS5_GPX3; - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = gpio_get_value(GPIO_X30); // WP_GPIO - strncpy((char *)gpios->gpios[count].name, "write protect", - GPIO_MAX_NAME_LENGTH); - count++; + /* Recovery: active low */ + {-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"}, - /* Recovery: active low */ - 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++; + /* Lid: active high (LID_GPIO) */ + {EXYNOS5_GPX3, ACTIVE_HIGH, gpio_get_value(GPIO_X34), "lid"}, - /* Lid: active high */ - gpios->gpios[count].port = EXYNOS5_GPX3; - gpios->gpios[count].polarity = ACTIVE_HIGH; - gpios->gpios[count].value = gpio_get_value(GPIO_X34); // LID_GPIO - strncpy((char *)gpios->gpios[count].name, "lid", GPIO_MAX_NAME_LENGTH); - count++; - - /* Power: virtual GPIO active low */ - gpios->gpios[count].port = EXYNOS5_GPX1; - gpios->gpios[count].polarity = ACTIVE_LOW; - gpios->gpios[count].value = - gpio_get_value(GPIO_X12); // POWER_GPIO - strncpy((char *)gpios->gpios[count].name, "power", - GPIO_MAX_NAME_LENGTH); - count++; - - gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio)); - gpios->count = count; - - printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size); + /* Power: virtual GPIO active low (POWER_GPIO) */ + {EXYNOS5_GPX1, ACTIVE_LOW, gpio_get_value(GPIO_X12), "power"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); } int get_recovery_mode_switch(void) 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 <boot/coreboot_tables.h> -#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 |