From 6217e9beff16d805ca833e79a2931bcdb3d02a44 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 10 Dec 2018 11:29:36 -0800 Subject: vendorcode/google/chromeos: Get ACPI pin from GPIO library If the generic GPIO library is enabled the code that generates the GPIO table in ACPI should attempt to get the GPIO pin value from the gpio_acpi_pin() function. BUG=b:120686247 TEST=Tested on Sarien board to ensure that GPIO pin exported by Chrome OS for the Write Protect signal is correct. Change-Id: I267694b576009f79bacac6eda5f32bbf51742d78 Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/c/30132 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/vendorcode/google/chromeos/acpi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/acpi.c b/src/vendorcode/google/chromeos/acpi.c index 6605809023..13c757633b 100644 --- a/src/vendorcode/google/chromeos/acpi.c +++ b/src/vendorcode/google/chromeos/acpi.c @@ -14,6 +14,9 @@ */ #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) @@ -28,7 +31,12 @@ 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); - acpigen_write_integer(gpios[i].gpio_num); + /* 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_string(gpios[i].device); acpigen_pop_len(); } -- cgit v1.2.3