diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2018-12-17 15:26:35 +0000 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2018-12-17 19:18:22 +0000 |
| commit | 0907aa0fe60f1b51078e43dc2b52b24be51979cb (patch) | |
| tree | 4793448c21f3de3b2aa33f63e2f05f703a379ba3 | |
| parent | 969ed357f823659a6861a2ca38f3ad9d7b58f949 (diff) | |
Revert "vendorcode/google/chromeos: Get ACPI pin from GPIO library"
This reverts commit 6217e9beff16d805ca833e79a2931bcdb3d02a44.
Reason for revert: boards with CROS_GPIO_VIRTUAL selected in
absence of dedicated recovery GPIO pin is die-ing now at
gpio.c file line. 127
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Change-Id: Ief20681b2a7ed4d15fd2d637ae034d54a96b2d6f
Reviewed-on: https://review.coreboot.org/c/30278
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/vendorcode/google/chromeos/acpi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/vendorcode/google/chromeos/acpi.c b/src/vendorcode/google/chromeos/acpi.c index 13c757633b..6605809023 100644 --- a/src/vendorcode/google/chromeos/acpi.c +++ b/src/vendorcode/google/chromeos/acpi.c @@ -14,9 +14,6 @@ */ #include <arch/acpigen.h> -#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) -#include <gpio.h> -#endif #include "chromeos.h" void chromeos_acpi_gpio_generate(const struct cros_gpio *gpios, size_t num) @@ -31,12 +28,7 @@ void chromeos_acpi_gpio_generate(const struct cros_gpio *gpios, size_t num) acpigen_write_package(4); acpigen_write_integer(gpios[i].type); acpigen_write_integer(gpios[i].polarity); - /* Get ACPI pin from GPIO library if available */ -#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) - acpigen_write_integer(gpio_acpi_pin(gpios[i].gpio_num)); -#else - acpigen_write_integer(gpios[i].gpio_num); -#endif + acpigen_write_integer(gpios[i].gpio_num); acpigen_write_string(gpios[i].device); acpigen_pop_len(); } |