From 0907aa0fe60f1b51078e43dc2b52b24be51979cb Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 17 Dec 2018 15:26:35 +0000 Subject: 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 Change-Id: Ief20681b2a7ed4d15fd2d637ae034d54a96b2d6f Reviewed-on: https://review.coreboot.org/c/30278 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Aaron Durbin --- src/vendorcode/google/chromeos/acpi.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/vendorcode/google/chromeos') 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 -#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB) -#include -#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(); } -- cgit v1.2.3