Revert "vendorcode/google/chromeos: Get ACPI pin from GPIO library"

This reverts commit 6217e9beff.

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>
This commit is contained in:
Duncan Laurie 2018-12-17 15:26:35 +00:00
parent 969ed357f8
commit 0907aa0fe6
1 changed files with 1 additions and 9 deletions

View File

@ -14,9 +14,6 @@
*/ */
#include <arch/acpigen.h> #include <arch/acpigen.h>
#if IS_ENABLED(CONFIG_GENERIC_GPIO_LIB)
#include <gpio.h>
#endif
#include "chromeos.h" #include "chromeos.h"
void chromeos_acpi_gpio_generate(const struct cros_gpio *gpios, size_t num) 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_package(4);
acpigen_write_integer(gpios[i].type); acpigen_write_integer(gpios[i].type);
acpigen_write_integer(gpios[i].polarity); 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); acpigen_write_integer(gpios[i].gpio_num);
#endif
acpigen_write_string(gpios[i].device); acpigen_write_string(gpios[i].device);
acpigen_pop_len(); acpigen_pop_len();
} }