diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-25 09:04:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-25 09:04:01 -0400 |
| commit | 0ac83d080a0044cd0d8f782ba12f02cf969d3004 (patch) | |
| tree | ca5c2351113ba9b56d59e241a8857c7e6e8f5604 /lib/acpi/acpi_dp.c | |
| parent | 67ece26d8b5d4bfa4fda8c456261c465d0815d7d (diff) | |
| parent | 8c180d669a0f4a8eb70bde8c74c73cef45993f67 (diff) | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-x86 into next
- Enhance the 'zboot' command to be more like 'bootm' with sub-commands
- The last series of ACPI core changes for programmatic generation of
ACPI tables
- Add all required ACPI tables for ApolloLake and enable ACPIGEN on
Chromebook Coral
- A feature minor enhancements to the 'hob' command
- Intel edison: Support for writing an xFSTK image via binman
Diffstat (limited to 'lib/acpi/acpi_dp.c')
| -rw-r--r-- | lib/acpi/acpi_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c index 579cab47715..7e3e3259d8d 100644 --- a/lib/acpi/acpi_dp.c +++ b/lib/acpi/acpi_dp.c @@ -324,7 +324,7 @@ struct acpi_dp *acpi_dp_add_integer_array(struct acpi_dp *dp, const char *name, struct acpi_dp *acpi_dp_add_gpio(struct acpi_dp *dp, const char *name, const char *ref, int index, int pin, - enum acpi_irq_polarity polarity) + enum acpi_gpio_polarity polarity) { struct acpi_dp *gpio; @@ -336,7 +336,7 @@ struct acpi_dp *acpi_dp_add_gpio(struct acpi_dp *dp, const char *name, if (!acpi_dp_add_reference(gpio, NULL, ref) || !acpi_dp_add_integer(gpio, NULL, index) || !acpi_dp_add_integer(gpio, NULL, pin) || - !acpi_dp_add_integer(gpio, NULL, polarity == ACPI_IRQ_ACTIVE_LOW)) + !acpi_dp_add_integer(gpio, NULL, polarity == ACPI_GPIO_ACTIVE_LOW)) return NULL; if (!acpi_dp_add_array(dp, gpio)) |